perfsonar development work

Author: dante.delvaux
Date: 2012-04-06 17:43:24 +0100 (Fri, 06 Apr 2012)
New Revision: 5917

Modified:
   trunk/perfsonar-java-base2/pom.xml
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/RequestHandler.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulerTask.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
Log:
Changing some error logging to info level, removing useless printStackTrace.

Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml  2012-04-05 17:20:37 UTC (rev 5916)
+++ trunk/perfsonar-java-base2/pom.xml  2012-04-06 16:43:24 UTC (rev 5917)
@@ -133,6 +133,12 @@
                        <groupId>org.apache.axis2</groupId>
                        <artifactId>axis2-jaxws</artifactId>
                        <version>1.4.1</version>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>stax-api</artifactId>
+                                       <groupId>javax.xml.stream</groupId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
                <!-- got for auth -->
@@ -222,8 +228,8 @@
                </dependency>
 
                <dependency>
-                       <groupId>xmldb</groupId>
-                       <artifactId>xmldb-api</artifactId>
+                       <groupId>exist</groupId>
+                       <artifactId>xmldb</artifactId>
                        <version>exist-1.2.6</version>
                </dependency>
                <dependency>

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
    2012-04-05 17:20:37 UTC (rev 5916)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
    2012-04-06 16:43:24 UTC (rev 5917)
@@ -144,7 +144,7 @@
 
                 //if an exception was thrown, convert it to result code
                 //and add as a new message (to be joined) to array
-                logger.error("Message handler result code: "+e);
+                logger.info("Message handler result code: " + e);
                 
resSM.setElement(ResultCodesUtil.generateResultMessage(e.getResultCode(),e.getMessage()));
 
             }
@@ -193,13 +193,9 @@
                 messages.add(message);
 
             } catch (NoSuchMetadataException e) {
-
                 //wrong MetadataIdRef, remove it
-                //TODO: ?
-                e.printStackTrace();
-
+               logger.warn("metadataIdRef is empty or there is no Metadata 
with the given metadataIdRef, metadataIdRef=" + metadataIdRef);
             }
-
         }
 
         return messages;

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/RequestHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/RequestHandler.java
     2012-04-05 17:20:37 UTC (rev 5916)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/RequestHandler.java
     2012-04-06 16:43:24 UTC (rev 5917)
@@ -93,7 +93,7 @@
                             
getConfiguration().getMessageHandlerClassName(type);
 
         } catch (Exception ex) {
-            logger.error("Message type ["+type+
+            logger.warn("Message type ["+type+
                     "] not supported or missing mapping/configuration.");
         }
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulerTask.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulerTask.java
   2012-04-05 17:20:37 UTC (rev 5916)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulerTask.java
   2012-04-06 16:43:24 UTC (rev 5917)
@@ -12,8 +12,7 @@
  */
 public class SchedulerTask {
 
-       protected static final Logger logger = 
Logger.getLogger(SchedulerTask.class
-                       .getName());
+       protected static final Logger logger = 
Logger.getLogger(SchedulerTask.class.getName());
 
        // --------------------------------------------- Variables
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
       2012-04-05 17:20:37 UTC (rev 5916)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
       2012-04-06 16:43:24 UTC (rev 5917)
@@ -13,7 +13,6 @@
 import org.xmldb.api.modules.XMLResource;
 
 /**
- * 
  * Supports Initialization of ExistDB
  * 
  * @author Slawomir Trzaszczka
@@ -42,7 +41,7 @@
 
                XMLResource document = (XMLResource) 
collection.createResource(
                                fileName, "XMLResource");
-               File f = new File(filePath + "/" + fileName);
+               File f = new File(filePath + File.separator + fileName);
                document.setContent(f);
                collection.storeResource(document);
        }
@@ -52,6 +51,7 @@
                        @SuppressWarnings("rawtypes")
                        Class cl = 
Class.forName("org.exist.xmldb.DatabaseImpl");
                        Database database = (Database) cl.newInstance();
+                       // The following is needed in case of embedded DB
 //             database.setProperty("create-database", "true");
                        logger.debug("••• Connecting to eXist DB as \"" + 
getUsername() + "\" •••");
                        DatabaseManager.registerDatabase(database);