svn commit: r1091036 - in /incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest: JAXBProvider.java ResourceManagerImp.java util/

[cihan]

Author: cihan
Date: Mon Apr 11 11:30:38 2011
New Revision: 1091036

URL: http://svn.apache.org/viewvc?rev=1091036&view=rev
Log:
Cleanup.
-Removed string concatenation in logger entries.
-Removed unnecessary comments.
-Removed unused classes.

Removed:
    
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/util/
Modified:
    
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
    
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java

Modified: 
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java?rev=1091036&r1=1091035&r2=1091036&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
 (original)
+++ 
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
 Mon Apr 11 11:30:38 2011
@@ -53,7 +53,6 @@ import org.apache.stanbol.ontologymanage
 import 
org.apache.stanbol.ontologymanager.store.model.ResourceMetaInformationType;
 import org.apache.stanbol.ontologymanager.store.model.SuperProperties;
 import org.apache.stanbol.ontologymanager.store.model.Superclasses;
-import org.apache.stanbol.ontologymanager.store.rest.util.XMLUtil;
 import org.xml.sax.SAXException;
 
 import com.sun.jersey.spi.resource.Singleton;
@@ -76,7 +75,7 @@ public class JAXBProvider implements Mes
                                     "model/SearchRESTfulInterface.xsd"};
         SchemaFactory schemaFactory = 
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI,
             
"com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory",
-            XMLUtil.class.getClassLoader());
+            JAXBProvider.class.getClassLoader());
 
         List<StreamSource> streamSourceList = new Vector<StreamSource>();
         for (String schemaLocation : schemaLocations) {

Modified: 
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java?rev=1091036&r1=1091035&r2=1091036&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java
 (original)
+++ 
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java
 Mon Apr 11 11:30:38 2011
@@ -193,8 +193,7 @@ public class ResourceManagerImp implemen
     public static ResourceManagerImp getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new ResourceManagerImp();
-            // logger.warn("Creating Resource Manager: Properties must be 
set");
-        } else {}
+        }
 
         return INSTANCE;
     }
@@ -250,7 +249,6 @@ public class ResourceManagerImp implemen
                                             + CLASS_RESOURCE + "')");
                 }
                 con.close();
-                // logger.info("Connection Closed");
             }
         } catch (Exception e) {
             logger.error("Error ", e);
@@ -283,7 +281,6 @@ public class ResourceManagerImp implemen
                                             + dataPropertyPath + "', '" + 
DATA_PROPERTY_RESOURCE + "')");
                 }
                 con.close();
-                // logger.info("Connection Closed");
             }
         } catch (Exception e) {
             logger.error("Error ", e);
@@ -470,7 +467,7 @@ public class ResourceManagerImp implemen
             // first clear hashtables
             String ontologyPath = ontologies.get(ontologyURI);
             if (ontologyPath == null) {
-                logger.warn("Ontology " + ontologyURI + " already deleted");
+                logger.warn("Ontology {} already deleted ", ontologyURI);
                 return;
             }
             ontologies.remove(ontologyURI);
@@ -552,7 +549,6 @@ public class ResourceManagerImp implemen
             statement.executeUpdate(sql);
 
             con.close();
-            // logger.info("Connection Closed");
 
         } catch (Exception e) {
             logger.error("Error ", e);
@@ -569,7 +565,7 @@ public class ResourceManagerImp implemen
             // first clear hashtables
             String classPath = resources.get(resourceURI);
             if (classPath == null) {
-                logger.warn("Resource" + resourceURI + "not found");
+                logger.warn("Resource {} not found", resourceURI);
                 return;
             }
 
@@ -591,8 +587,6 @@ public class ResourceManagerImp implemen
         }
     }
 
-    // FIXME:: make sure that this method returns the reference to the imported
-    // class!!!
     /*
      * (non-Javadoc)
      * 
@@ -647,7 +641,7 @@ public class ResourceManagerImp implemen
                                         IllegalAccessException,
                                         ClassNotFoundException,
                                         SQLException {
-        return DriverManager.getConnection(DB_URL);// , DB_USER, DB_PW);
+        return DriverManager.getConnection(DB_URL);
     }
 
     private String normalizeURI(String uri) {