perfsonar development work

Author: dante.delvaux
Date: 2013-04-18 15:34:57 +0100 (Thu, 18 Apr 2013)
New Revision: 6250

Modified:
   trunk/BUILDING.txt
   trunk/perfsonar-base/messaging/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
Log:
RRD MA: correcting testing samples for SQL DB.
pSbase3: updating the groovy compiler configuration to try to solve the CI 
build issue

Modified: trunk/BUILDING.txt
===================================================================
--- trunk/BUILDING.txt  2013-04-17 20:38:53 UTC (rev 6249)
+++ trunk/BUILDING.txt  2013-04-18 14:34:57 UTC (rev 6250)
@@ -10,7 +10,6 @@
 Generated artifacts are to be found in the target directories inside
 each subproject (sub-directory).
 
-
 Note that currently not all components are included in the aggregator
 project. This is because not all components have been updated to use
 the latest snapshot revisions of dependent artifacts.
@@ -41,6 +40,7 @@
        mvn -s mvn-settings.xml clean package
        mvn -s mvn-settings.xml pacakge -am -pl perfsonar-java-sql-ma
 
+
 Maven project structure
 -----------------------
 
@@ -68,12 +68,9 @@
 
 - Reporting configuration used to generate a Maven site report.
 
-
-
 Library version numbers are NOT specified in the parent, as various
 subproducts use different versions of third party libraries.
 
-
 Note again that currently not all subproducts follow this structure.
 
 
@@ -99,12 +96,10 @@
 profile is only enabled on Linux. This profile too can be explicitly
 disabled using -P !rpm, or explicitly enabled using -P rpm.
 
-
 Like any other artifacts, the output packages are found in the target
 directory of each module (the RPM package is in a subdirectory; look
 for it in the target/rpm directory tree).
 
-
 Note that we deliberately build these artifacts as secondary
 artifacts. The main artifact type is typically JAR (for libraries like
 perfSONAR Base) or WAR for subproducts (these are deployable to common
@@ -125,7 +120,6 @@
 tests, findbugs, and pmd can be inspected in Jenkins.
 
 
-
 Releasing perfSONAR
 -------------------
 

Modified: trunk/perfsonar-base/messaging/pom.xml
===================================================================
--- trunk/perfsonar-base/messaging/pom.xml      2013-04-17 20:38:53 UTC (rev 
6249)
+++ trunk/perfsonar-base/messaging/pom.xml      2013-04-18 14:34:57 UTC (rev 
6250)
@@ -116,13 +116,22 @@
                        </plugin>
                        <plugin>
                                <artifactId>maven-compiler-plugin</artifactId>
-                               
<version>2.3.2</version><!--$NO-MVN-MAN-VER$--> <!-- Groovy Eclipse Compiler 
does not work with 3.0  -->
                                <!-- This also means that one has to install 
the Groovy-Eclipse configurator for m2Eclipse -->
                                <!-- See 
http://groovy.codehaus.org/Groovy-Eclipse+compiler+plugin+for+Maven#Groovy-EclipsecompilerpluginforMaven-Groovy-Eclipseconfiguratorform2Eclipse
 -->
                                <configuration>
                                        
<compilerId>groovy-eclipse-compiler</compilerId>
                                        <verbose>false</verbose>
-                               </configuration>
+                                       <!-- This includes/testIncludes 
section if currently needed for the groovy-eclipse-compiler to work -->
+                                       <!-- See 
http://markmail.org/message/ti6svvi4apwecvjq -->
+                    <includes>
+                        <include>**/*.groovy</include>
+                        <include>**/*.java</include>
+                    </includes>
+                    <testIncludes>
+                        <testInclude>**/*.groovy</testInclude>
+                        <testInclude>**/*.java</testInclude>
+                    </testIncludes>
+                </configuration>
                                <dependencies>
                                        <dependency>
                                                
<groupId>org.codehaus.groovy</groupId>
@@ -144,41 +153,5 @@
                                </executions>
                        </plugin>
                </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <!--This plugin's configuration is used to 
store Eclipse m2e settings only. It has no influence on the Maven build 
itself.-->
-                               <plugin>
-                                       <groupId>org.eclipse.m2e</groupId>
-                                       
<artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               
<pluginExecution>
-                                                                       
<pluginExecutionFilter>
-                                                                             
  <groupId>
-                                                                             
          org.apache.maven.plugins
-                                                                             
  </groupId>
-                                                                             
  <artifactId>
-                                                                             
          maven-compiler-plugin
-                                                                             
  </artifactId>
-                                                                             
  <versionRange>
-                                                                             
          [2.3.2,)
-                                                                             
  </versionRange>
-                                                                             
  <goals>
-                                                                             
          <goal>testCompile</goal>
-                                                                             
          <goal>compile</goal>
-                                                                             
  </goals>
-                                                                       
</pluginExecutionFilter>
-                                                                       
<action>
-                                                                             
  <ignore></ignore>
-                                                                       
</action>
-                                                               
</pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
        </build>
 </project>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
 2013-04-17 20:38:53 UTC (rev 6249)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
 2013-04-18 14:34:57 UTC (rev 6250)
@@ -1,52 +1,40 @@
-# running:
+# This file contains some sample metadata DB entries that are used by the 
soapUI tests.
+# If you make changes to this file, you will need to adapt the soapUI tests 
accordingly.
+# You can install this testing DB content by running:
 # mysql -u root -p < test_rrdma_db.sql
 
 USE perfsonar_rrdma 
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant2', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'out',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'out',
+'1000000000', 'project:geant2', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/errors/2.0',
+       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant2', 
'http://ggf.org/ns/nmwg/characteristic/errors/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'inerrors', 'Eps', '300', 'ABSOLUTE', '100', '0', '10000000');
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/errors/2.0',
+       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant2', 
'http://ggf.org/ns/nmwg/characteristic/discards/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
-'outerrors', 'Eps', '300', 'ABSOLUTE', '100', '0', '10000000');
-
-INSERT
-       INTO interfaces
-       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/discards/2.0',
-       
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'indiscards', 'Dps', '300', 'ABSOLUTE', '100', '0', '10000000');
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/discards/2.0',
-       
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
-'outdiscards', 'Dps', '300', 'ABSOLUTE', '100', '0', '10000000');
-
-INSERT
-       INTO interfaces
        VALUES (NULL, 'subj1', 'test-hostName2', '10.1.2.2', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'in',
 '1000000000', 'project:geant2', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
@@ -55,7 +43,7 @@
 INSERT
        INTO interfaces
        VALUES (NULL, 'subj1', 'test-hostName2', '10.1.2.2', 'ipv4', 
'TenGigabitEthernet1/1', 'test1', 'out',
-'1000000000', 'project:geant', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+'1000000000', 'project:geant2', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');