[Carbon-dev] svn commit r41901 - trunk/carbon-components/governance/org.wso2.carbon.governance.list/src/main/java/org/wso2/carbon/governance/list/util

[dimuthu at wso2.com]

Author: dimuthu
Date: Mon Jul 27 01:46:35 2009
New Revision: 41901
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=41901

Log:
storing the query in a defined place + removed transaction


Modified:
   trunk/carbon-components/governance/org.wso2.carbon.governance.list/src/main/java/org/wso2/carbon/governance/list/util/QueryUtil.java

Modified: trunk/carbon-components/governance/org.wso2.carbon.governance.list/src/main/java/org/wso2/carbon/governance/list/util/QueryUtil.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/governance/org.wso2.carbon.governance.list/src/main/java/org/wso2/carbon/governance/list/util/QueryUtil.java?rev=41901&r1=41900&r2=41901&view=diff
==============================================================================
--- trunk/carbon-components/governance/org.wso2.carbon.governance.list/src/main/java/org/wso2/carbon/governance/list/util/QueryUtil.java	(original)
+++ trunk/carbon-components/governance/org.wso2.carbon.governance.list/src/main/java/org/wso2/carbon/governance/list/util/QueryUtil.java	Mon Jul 27 01:46:35 2009
@@ -7,6 +7,8 @@
 import org.wso2.carbon.registry.core.Collection;
 import org.wso2.carbon.registry.core.RegistryConstants;
 import org.wso2.carbon.registry.core.CollectionImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.util.UUID;
 import java.util.Map;
@@ -14,35 +16,33 @@
 
 public class QueryUtil {
 
-     public static String[] getResult(String mediatype)throws RegistryException {
+    private static final Log log = LogFactory.getLog(QueryUtil.class);
+
+    public static String[] getResult(String mediatype)throws RegistryException {
         String sql = "SELECT REG_PATH_ID, REG_NAME FROM REG_RESOURCE WHERE REG_MEDIA_TYPE=?";
-        UserRegistry registry = (UserRegistry)CommonUtil.getSystemRegistry();
-        Resource query = registry.newResource();
+        UserRegistry systemRegistry = (UserRegistry)CommonUtil.getSystemRegistry();
+        UserRegistry userRegistry = CommonUtil.getRegistry();
 
-        String path = "/governance/configuration/metadata/";
+        String path = "system/queries/governance/searchMetaData";
         String[] result = null;
-         try {
-             registry.beginTransaction();
-             if(!registry.resourceExists(path)){
-                 Collection col = new CollectionImpl();
-                 registry.put(path,col);
+        try {
+
+             if (!systemRegistry.resourceExists(path)) {
+                 Resource query = systemRegistry.newResource();
+                 query.setContent(sql);
+                 query.setMediaType(RegistryConstants.SQL_QUERY_MEDIA_TYPE);
+                 query.addProperty(RegistryConstants.RESULT_TYPE_PROPERTY_NAME,
+                         RegistryConstants.RESOURCES_RESULT_TYPE);
+                 systemRegistry.put(path, query);
              }
-             query.setContent(sql);
-             query.setMediaType(RegistryConstants.SQL_QUERY_MEDIA_TYPE);
-             query.addProperty(RegistryConstants.RESULT_TYPE_PROPERTY_NAME,
-                     RegistryConstants.RESOURCES_RESULT_TYPE);
-             String temppath = path + UUID.randomUUID().toString();
-             registry.put(temppath, query);
              Map parameter = new HashMap();
-             parameter.put("1",mediatype);
-             result = (String[])registry.executeQuery(temppath,parameter).getContent();
-             registry.delete(temppath);
-             registry.commitTransaction();
-         } catch (Exception e) {
-             registry.rollbackTransaction();
-             throw new RegistryException("Unable to get result", e);
+             parameter.put("1", mediatype);
+             result = (String[])userRegistry.executeQuery(path, parameter).getContent();
+         } catch (RegistryException e) {
+             String msg = "Unable to get result for media type: " + mediatype + ".";
+             log.error(msg, e);
+             throw new RegistryException(msg, e);
          }
-
          return result;
     }
 }