perfsonar development work

Author: dante.delvaux
Date: 2013-06-03 13:06:59 +0100 (Mon, 03 Jun 2013)
New Revision: 6431

Modified:
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/migration/MigratorComponent.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.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/requesthandler/axis2/Axis2RequestHandler.java
   trunk/perfsonar-java-rrd-ma/src/deb/control/changelog
   trunk/perfsonar-java-rrd-ma/src/rpm/changelog
Log:
pSbase2: generalising a few remaining logger instances.

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/migration/MigratorComponent.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/migration/MigratorComponent.java
 2013-05-31 16:44:18 UTC (rev 6430)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/migration/MigratorComponent.java
 2013-06-03 12:06:59 UTC (rev 6431)
@@ -5,8 +5,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.perfsonar.base2.service.configuration.Component;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 
@@ -17,7 +15,6 @@
  * 
  */
 public class MigratorComponent extends Component {
-    private static Logger logger = 
LoggerFactory.getLogger(MigratorComponent.class);
 
     private TemplateEngine engine;
     private ConfigFilesCollection configFiles;

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
 2013-05-31 16:44:18 UTC (rev 6430)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
 2013-06-03 12:06:59 UTC (rev 6431)
@@ -25,7 +25,7 @@
 
     // ----------------------------------------------------------- Variables
 
-    private static final Logger LOGGER = 
LoggerFactory.getLogger(GenericLSRegistrator.class);
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     // ----------------------------------------------------------- Methods
 
@@ -68,7 +68,7 @@
         Element responseElement = client.send(lsUrl.toString(), element);
         ServiceMessage serviceResponseMessage = new 
ServiceMessage(responseElement.getCopy());
 
-        LOGGER.debug("LS request sent to the LS {}", lsUrl.toString());
+        logger.debug("LS request sent to the LS {}", lsUrl.toString());
         return serviceResponseMessage;
     }
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
 2013-05-31 16:44:18 UTC (rev 6430)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
 2013-06-03 12:06:59 UTC (rev 6431)
@@ -21,7 +21,7 @@
  */
 public class LSRegistrationAction extends AbstractRegistrationAction {
 
-    private Logger logger = 
LoggerFactory.getLogger(LSRegistrationAction.class);
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     private boolean keepAliveEnabled = false;
 

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
     2013-05-31 16:44:18 UTC (rev 6430)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/RequestHandler.java
     2013-06-03 12:06:59 UTC (rev 6431)
@@ -18,7 +18,7 @@
 
     // ----------------------------------------------------- instance 
variables
 
-    private static final Logger LOGGER = 
LoggerFactory.getLogger(RequestHandler.class);
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     // ----------------------------------------------------------- 
Constructor
 
@@ -72,7 +72,7 @@
                     "No message type in request. Cannot find 
MessageHandler");
         }
 
-        LOGGER.debug("Message type is [{}]", type);
+        logger.debug("Message type is [{}]", type);
 
         // get Message Handler for message type (from mapping)
         String className = null;
@@ -81,7 +81,7 @@
             className = 
ConfigurationManager.getInstance().getConfiguration().getMessageHandlerClassName(type);
 
         } catch (Exception ex) {
-            LOGGER.warn("Message type [{}] not supported or missing 
mapping/configuration.", type);
+            logger.warn("Message type [{}] not supported or missing 
mapping/configuration.", type);
         }
 
         if (className == null) {
@@ -104,7 +104,7 @@
      */
     protected void runService(ServiceMessage request, ServiceMessage 
response) throws PerfSONARException {
 
-        LOGGER.debug("Run service handler");
+        logger.debug("Run service handler");
 
         Element requestElement = request.getElement();
         if (requestElement == null) {

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2013-05-31 16:44:18 UTC (rev 6430)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2013-06-03 12:06:59 UTC (rev 6431)
@@ -9,9 +9,6 @@
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.axis2.context.ServiceContext;
 
 import org.perfsonar.base2.service.configuration.Configuration;
@@ -44,8 +41,6 @@
 
     private ConfigurationManager configurationManager = null;
 
-    private static final Logger LOGGER = 
LoggerFactory.getLogger(Axis2RequestHandler.class);
-
     // ------------------------------------------------------------ 
constructor
 
     public Axis2RequestHandler() {
@@ -60,10 +55,10 @@
 
         if (serviceContext != null) {
             // print data taken from ServiceContext
-            LOGGER.debug("PerfSONAR Request Handler for Axis2 started. 
Service name is [{}], URL is [{}]",
+            logger.debug("PerfSONAR Request Handler for Axis2 started. 
Service name is [{}], URL is [{}]",
                     serviceContext.getName(), serviceContext.getMyEPR());
         } else {
-            LOGGER.debug("PerfSONAR Request Handler for Axis2 started. 
WARNING: Axis2 ServiceContext is null, "
+            logger.debug("PerfSONAR Request Handler for Axis2 started. 
WARNING: Axis2 ServiceContext is null, "
                     + "perhaps service is just tested without Axis2 or Axis2 
is misconfigured");
         }
         // get configuration
@@ -72,7 +67,7 @@
             configurationManager = ConfigurationManager.getInstance();
             Configuration configuration = 
configurationManager.getConfiguration();
             Service service = configuration.getService();
-            LOGGER.debug("Service name from perfSONAR configuration is 
[{}]", service.getName());
+            logger.debug("Service name from perfSONAR configuration is 
[{}]", service.getName());
 
             // response object
             OMElement outOMElement = null;
@@ -118,7 +113,7 @@
 
             // stop time measurement
             long t2 = System.currentTimeMillis();
-            LOGGER.debug("Service done successfuly in [{} ms]", t2 - t1);
+            logger.debug("Service done successfuly in [{} ms]", t2 - t1);
 
             // return successful response
             return outOMElement;
@@ -128,7 +123,7 @@
 
             // perfSONAR result code if request message cannot be server
             // (parsing, etc.)
-            LOGGER.error("Parse error: {}", excp.toString());
+            logger.error("Parse error: {}", excp.toString());
 
             // return error response
             // TODO: URL event types

Modified: trunk/perfsonar-java-rrd-ma/src/deb/control/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma/src/deb/control/changelog       2013-05-31 
16:44:18 UTC (rev 6430)
+++ trunk/perfsonar-java-rrd-ma/src/deb/control/changelog       2013-06-03 
12:06:59 UTC (rev 6431)
@@ -1,67 +1,31 @@
 perfsonar-java-rrd-ma (3.4.2-1) testing; urgency=low
 
+  * Correction of EchoRequest answer eventType, PSSERVICES-538
   * WebAdmin restored and updated
   * WebAdmin: added a page to empty the metadata DB
   * Updated project documentation
 
- -- Antoine Delvaux 
<>
  Tue, 14 May 2013 21:22:00 +0000
+ -- Antoine Delvaux 
<>
  Tue, 31 May 2013 16:51:00 +0000
 
 perfsonar-java-rrd-ma (3.4-7) testing; urgency=low
 
+  * New: Transition to SQL db for metadata storage in replacement of eXist
+  * New: NMWG to SQL Converter application added
+  * Moved to Tomcat 6
+  * Replaced rrdjtool with JNA wrapper of librrd
   * Updated external dependencies to newer versions
-  * Dropped perfsonar base 3
-  * Added automatic table creation during intial start
+  * Reduced logging overhead of large response messages
+  * Added automatic table creation during initial start (if DB exist)
   * Changed default configuration to assume Tomcat port 8080
   * Changed default configuration to assume perfsonar_rrdma schema name
-  * Added nmwg-sql-converter utility
 
  -- Gerd Behrmann 
<>
  Wed, 29 Aug 2012 14:51:00 +0200
 
-perfsonar-java-rrd-ma (3.4-6) testing; urgency=low
-
-  * Replaced rrdjtool with JNA wrapper of librrd
-
- -- Gerd Behrmann 
<>
  Tue, 21 Aug 2012 11:06:00 +0200
-
-perfsonar-java-rrd-ma (3.4-5) testing; urgency=low
-
-  * Changed Hibernate config to not recreate schema on restart
-  * Changed SQL meta data backend to not hardcode interface name
-  * Reduced logging overhead of large response messages
-
- -- Gerd Behrmann 
<>
  Mon, 20 Aug 2012 11:30:00 +0200
-
-perfsonar-java-rrd-ma (3.4-4) stable; urgency=low
-
-  * Moved to Tomcat 6
-  * Set explicit table name for interfaces table
-
- -- Gerd Behrmann 
<>
  Fri, 17 Aug 2012 10:00:00 +0200
-
-perfsonar-java-rrd-ma (3.4-3) stable; urgency=low
-
-  * Empty message error reported by tester fixed. 
-  
- -- Piotr Pikusa 
<>
  Fri, 12 May 2012 08:00:00 +0200
-
-
-perfsonar-java-rrd-ma (3.4-2) stable; urgency=low
-
-  * All errors reported by tester fixed
-  
- -- Piotr Pikusa 
<>
  Fri, 12 Mar 2012 08:00:00 +0200
-
-
-perfsonar-java-rrd-ma (3.4-1) stable; urgency=low
-
-  * Transition to SQL db
-  
- -- Piotr Pikusa 
<>
  Fri, 09 Mar 2012 08:00:00 +0200
-
 perfsonar-java-rrd-ma (3.3-1) stable; urgency=low
 
   * New Web admin implemented
   * Old configuration.xml file replaced with new. The old file renamed to 
'configuration.xml.old'. This is temporary solution until new idea about conf 
files replecament system is invent.
+
  -- Piotr Pikusa 
<>
  Wed, 22 Mar 2010 16:00:00 +0200
 
 perfsonar-java-rrd-ma (3.3-0) stable; urgency=low

Modified: trunk/perfsonar-java-rrd-ma/src/rpm/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma/src/rpm/changelog       2013-05-31 16:44:18 
UTC (rev 6430)
+++ trunk/perfsonar-java-rrd-ma/src/rpm/changelog       2013-06-03 12:06:59 
UTC (rev 6431)
@@ -1,29 +1,20 @@
-* Tue May 14 2013 Antoine Delvaux 
<>
 3.4.2-1
+* Tue May 31 2013 Antoine Delvaux 
<>
 3.4.2-1
+- Correction of EchoRequest answer eventType, PSSERVICES-538
 - WebAdmin restored and updated
 - WebAdmin: added a page to empty the metadata DB
 - Updated project documentation
 
-* Wed Aug 29 2012 Gerd Behrmann 
<>
 3.4-2
-- Set explicit table name for interfaces table
-- Reduced logging overhead of large messages
-- Changed SQL meta data backend to not hardcode interface name
-- Changed Hibernate config to not recreate schema on restart
+* Wed Aug 29 2012 Gerd Behrmann 
<>
 3.4-4
+- New: SQL backend for metadata storage in replacement of eXist
+- New: NMWG to SQL Converter application added
+- Moved to Tomcat 6
 - Replaced rrdjtool with JNA wrapper of librrd
 - Updated external dependencies to newer versions
-- Dropped perfsonar base 3
-- Added automatic table creation during intial start
+- Reduced logging overhead of large messages
+- Added automatic table creation during initial start (if DB exist)
 - Changed default configuration to assume Tomcat port 8080
 - Changed default configuration to assume perfsonar_rrdma schema name
-- Added nmwg-sql-converter utility
 
-* Tue Apr 24 2012 Piotr Pikusa 
<>
 3.4-1
-- Cooperation with new version of Web psUI fixed
-
-* Tue Mar 09 2012 Piotr Pikusa 
<>
 3.4-0
-- New: SQL backend provided instead of exist
-- New: NMWG to SQL Converter application added
-
-
 * Tue Mar 23 2010 Piotr Pikusa 
<>
 3.3-2
 - New: Web Admin v1.0 integrated with the service
 - Change: new configuration.xml