perfsonar development work

Author: dante.delvaux
Date: 2013-03-13 15:40:57 +0000 (Wed, 13 Mar 2013)
New Revision: 6190

Modified:
   trunk/perfsonar-base/messaging/pom.xml
   
trunk/perfsonar-base/messaging/src/main/java/net/geant/perfsonar/templates/TemplateEngine.java
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
   
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
Log:
psBase3: adding a bit more logging
RRD MA with base3: added one more unit test
RRD MA with SQL backend: correcting checkstyle "error" and changing packaging 
so we have a true perfsonar-java-rrd-ma

Modified: trunk/perfsonar-base/messaging/pom.xml
===================================================================
--- trunk/perfsonar-base/messaging/pom.xml      2013-03-13 11:50:48 UTC (rev 
6189)
+++ trunk/perfsonar-base/messaging/pom.xml      2013-03-13 15:40:57 UTC (rev 
6190)
@@ -85,6 +85,18 @@
             <version>4.9</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+            <scope>test</scope>
+        </dependency>
        </dependencies>
 
        <build>

Modified: 
trunk/perfsonar-base/messaging/src/main/java/net/geant/perfsonar/templates/TemplateEngine.java
===================================================================
--- 
trunk/perfsonar-base/messaging/src/main/java/net/geant/perfsonar/templates/TemplateEngine.java
      2013-03-13 11:50:48 UTC (rev 6189)
+++ 
trunk/perfsonar-base/messaging/src/main/java/net/geant/perfsonar/templates/TemplateEngine.java
      2013-03-13 15:40:57 UTC (rev 6190)
@@ -7,6 +7,8 @@
 
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides facade to the underlying template engine. This implementation 
uses
@@ -16,7 +18,9 @@
  * 
  */
 public class TemplateEngine {
-       private final static VelocityEngine templateEngine = new 
VelocityEngine();
+    protected static Logger logger = 
LoggerFactory.getLogger("TemplateEngine");
+
+    private final static VelocityEngine templateEngine = new 
VelocityEngine();
        private final static VelocityContext context = new VelocityContext();
 
        static {
@@ -27,8 +31,9 @@
 
        private static InputStream getTemplate(Class<?> homeDir, String name)
                        throws IOException {
-               final InputStream in = 
homeDir.getClassLoader().getResourceAsStream(
-                               getFullPath(homeDir, name));
+           String fullPath = getFullPath(homeDir, name);
+           logger.debug("Trying to load template: {}", fullPath);
+               final InputStream in = 
homeDir.getClassLoader().getResourceAsStream(fullPath);
 
                if (in == null)
                        throw new IOException("Template " + name + " cannot 
be found.");

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-03-13 11:50:48 
UTC (rev 6189)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-03-13 15:40:57 
UTC (rev 6190)
@@ -11,11 +11,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>perfsonar-java-rrd-ma-SQL_backend</artifactId>
+    <artifactId>perfsonar-java-rrd-ma</artifactId>
     <packaging>war</packaging>
     <version>3.4.2-SNAPSHOT</version>
 
-    <name>perfSONAR RRD MA - SQL backend</name>
+    <name>perfSONAR RRD MA</name>
     <description>perfSONAR Round Robin Database Measurement Archive with SQL 
backend</description>
     <inceptionYear>2009</inceptionYear>
 
@@ -296,6 +296,7 @@
                                 <configuration>
                                     
<deb>[[buildDir]]/[[installName]]_[[version]]_all.[[extension]]</deb>
                                     <timestamped>true</timestamped>
+                                    <verbose>false</verbose>
                                     <dataSet>
                                         <data>
                                             
<src>${project.build.directory}/${project.build.finalName}</src>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
 2013-03-13 11:50:48 UTC (rev 6189)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
 2013-03-13 15:40:57 UTC (rev 6190)
@@ -56,7 +56,8 @@
             Map<String, Object> jpaConfig = new HashMap<String, Object>();
             jpaConfig.put("javax.persistence.jdbc.driver", 
"com.mysql.jdbc.Driver");
             //FIXME: check if we need '&' or '&amp;'
-            jpaConfig.put("javax.persistence.jdbc.url", dbUri + schema + 
"?autoReconnectForPools=true&autoReconnectForPools=true");
+            jpaConfig.put("javax.persistence.jdbc.url", dbUri + schema
+                    + 
"?autoReconnectForPools=true&autoReconnectForPools=true");
             jpaConfig.put("javax.persistence.jdbc.user", username);
             jpaConfig.put("javax.persistence.jdbc.password", password);
             entityManagerFactory = 
Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, jpaConfig);

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
 2013-03-13 11:50:48 UTC (rev 6189)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
 2013-03-13 15:40:57 UTC (rev 6190)
@@ -12,11 +12,14 @@
 import net.geant.perfsonar.helpers.PerfSONARServiceClient;
 import net.geant.perfsonar.helpers.Response;
 import net.geant.perfsonar.ma.RRDMAService;
+import net.geant.perfsonar.response.EchoResponse;
 import net.geant.perfsonar.templates.NMWG;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
 /**
@@ -25,6 +28,8 @@
  * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
  */
 public class RRDMAWebServiceTest {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
        private static final String REQUEST_ID = "request1";
        private static final String SERVICE_URL = 
"http://localhost:9000/perfsonar-java-rrd-ma";;
        private final PerfSONARServiceClient client = new 
PerfSONARServiceClient(SERVICE_URL);
@@ -44,13 +49,25 @@
                service = null;
        }
 
+       /**
+        * This test that the resource loading from an external Jar is 
working fine.
+        * The EchoRequest template is coming from net.geant.perfsonar.base
+        */
        @Test
+       public void checkingEchoTemplate() {
+        logger.info("•••• Checking echo request template loading");
+        
assertNotNull(EchoResponse.class.getClassLoader().getResourceAsStream("net/geant/perfsonar/response/EchoResponse.template"));
+    }  
+       
+       @Test
        public void shouldSayEcho() throws SAXException, InterruptedException 
{
+        logger.info("•••• Checking echo request");
                assertEquals(new Response(NMWG.toEchoResponse(REQUEST_ID)), 
client.echo(REQUEST_ID));
        }
 
     @Test(expected=SOAPFaultException.class)
        public void shouldFail() throws FileNotFoundException, SAXException {
+        logger.info("•••• Checking MetadataKey request");
                client.invoke(new 
FileReader("samples/requests/MetadataKeyRequest-Discards-1.xml"));
        }
 }