perfsonar development work

Author: dante.delvaux
Date: 2013-09-13 18:32:25 +0100 (Fri, 13 Sep 2013)
New Revision: 6446

Modified:
   trunk/perfsonar-java-rrd-ma/pom.xml
   
trunk/perfsonar-java-rrd-ma/src/test/resources/perfsonar/conf/configuration.xml
Log:
RRD MA: 3.4.2 preparing SNAPSHOT release to test on GEANT server.

Modified: trunk/perfsonar-java-rrd-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/pom.xml 2013-07-05 18:23:09 UTC (rev 6445)
+++ trunk/perfsonar-java-rrd-ma/pom.xml 2013-09-13 17:32:25 UTC (rev 6446)
@@ -97,7 +97,7 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
             </plugin>
 
-            <!-- execution: mvn -P development -DskipDebProfile -pl 
perfsonar-java-rrd-ma clean integration-test -->
+            <!-- execution: mvn -P development -DskipDebProfile -pl 
perfsonar-java-rrd-ma clean tomcat6:run-war -->
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat6-maven-plugin</artifactId>
@@ -207,7 +207,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.24</version>
+            <version>5.1.26</version>
         </dependency>
 
     </dependencies>

Modified: 
trunk/perfsonar-java-rrd-ma/src/test/resources/perfsonar/conf/configuration.xml
===================================================================
--- 
trunk/perfsonar-java-rrd-ma/src/test/resources/perfsonar/conf/configuration.xml
     2013-07-05 18:23:09 UTC (rev 6445)
+++ 
trunk/perfsonar-java-rrd-ma/src/test/resources/perfsonar/conf/configuration.xml
     2013-09-13 17:32:25 UTC (rev 6446)
@@ -53,7 +53,7 @@
       </component>
       
       <component 
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
 name="metadataStorageDAO2">
-        <option name="uri" value="jdbc:mysql://rrdma-new:3306/"/>
+        <option name="uri" value="jdbc:mysql://localhost:3306/"/>
         <option name="schema" value ="perfsonar_rrdma"/>
         <option name="username" value="perfsonar_rrdma"/>
         <option name="password" value="testpass"/>