Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6225 - in trunk: . nmwg-sql-converter parent perfsonar-base/annotations perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/packaging/deb perfsonar-java-rrd-ma-base3 perfsonar-java-rrd-ma-base3/src/main/resources perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf perfsonar-java-web-admin perfsonar-java-web-admin/perfsonar-java-web-admin-component/src perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6225 - in trunk: . nmwg-sql-converter parent perfsonar-base/annotations perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/packaging/deb perfsonar-java-rrd-ma-base3 perfsonar-java-rrd-ma-base3/src/main/resources perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf perfsonar-java-web-admin perfsonar-java-web-admin/perfsonar-java-web-admin-component/src perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6225 - in trunk: . nmwg-sql-converter parent perfsonar-base/annotations perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/packaging/deb perfsonar-java-rrd-ma-base3 perfsonar-java-rrd-ma-base3/src/main/resources perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf perfsonar-java-web-admin perfsonar-java-web-admin/perfsonar-java-web-admin-component/src perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle
  • Date: Tue, 19 Mar 2013 21:29:00 +0000 (GMT)
  • Authentication-results: sfpop-ironport05.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-03-19 21:29:00 +0000 (Tue, 19 Mar 2013)
New Revision: 6225

Added:

trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/

trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/configuration.xml

trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/log4j.xml

trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/rrdma_db.sql

trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/

trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle/

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle/checkstyle.xml
Modified:
trunk/BUILDING.txt
trunk/nmwg-sql-converter/pom.xml
trunk/parent/pom.xml
trunk/perfsonar-base/annotations/pom.xml
trunk/perfsonar-base/apt/pom.xml
trunk/perfsonar-base/base/pom.xml
trunk/perfsonar-base/ls/pom.xml
trunk/perfsonar-base/messaging/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
trunk/perfsonar-java-rrd-ma-base3/pom.xml
trunk/perfsonar-java-web-admin/pom.xml
Log:
parent: regrouping common dependencies in a <dependencyManagement> section
base3: updating pom.xml to use parent-1.0.1-SNAPSHOT and re-organizing
dependencies accordingly
rrd-ma with base3: adding webadmin and its configuration
rrd-ma with SQL backend: correcting Debian packaging

Modified: trunk/BUILDING.txt
===================================================================
--- trunk/BUILDING.txt 2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/BUILDING.txt 2013-03-19 21:29:00 UTC (rev 6225)
@@ -34,6 +34,12 @@
your working directory; it is generally safer to rely on the Maven
aggregator project).

+However, if your project depends on some released perfSONAR artifacts
+(ie. parent-1.0.0 and not parent-1.0.0-SNAPSHOT) you must instruct
+maven to use the GÉANT Artifactory. This can be done the following way
+
+ mvn -s mvn-settings.xml clean package
+ mvn -s mvn-settings.xml pacakge -am -pl perfsonar-java-sql-ma

Maven project structure
-----------------------

Modified: trunk/nmwg-sql-converter/pom.xml
===================================================================
--- trunk/nmwg-sql-converter/pom.xml 2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/nmwg-sql-converter/pom.xml 2013-03-19 21:29:00 UTC (rev 6225)
@@ -2,7 +2,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

@@ -18,8 +18,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
</dependency>
</dependencies>


Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/parent/pom.xml 2013-03-19 21:29:00 UTC (rev 6225)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
@@ -11,8 +11,6 @@

<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
<maven-compiler-plugin.target>1.6</maven-compiler-plugin.target>
- <log4j.version>1.2.16</log4j.version>
- <slf4j.version>1.6.6</slf4j.version>
</properties>

<name>perfSONAR Java Services parent POM</name>
@@ -244,7 +242,7 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>0.11</version>
+ <version>1.0.1</version>
<configuration>
<verbose>false</verbose>
</configuration>
@@ -371,4 +369,70 @@
-->
</plugins>
</reporting>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jms</artifactId>
+ <groupId>javax.jms</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jmxtools</artifactId>
+ <groupId>com.sun.jdmk</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jmxri</artifactId>
+ <groupId>com.sun.jmx</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <version>2.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>

Modified: trunk/perfsonar-base/annotations/pom.xml
===================================================================
--- trunk/perfsonar-base/annotations/pom.xml 2013-03-15 01:40:26 UTC (rev
6224)
+++ trunk/perfsonar-base/annotations/pom.xml 2013-03-19 21:29:00 UTC (rev
6225)
@@ -6,13 +6,15 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<groupId>net.geant.perfsonar.base</groupId>
<artifactId>annotations</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <name>perfSONAR base 3 Annotations</name>
+ <description>The psBase3 Annotations</description>

<build>
<plugins>
@@ -27,6 +29,4 @@
</plugin>
</plugins>
</build>
- <description>The psBase3 Annotations</description>
- <name>perfSONAR base 3 Annotations</name>
</project>
\ No newline at end of file

Modified: trunk/perfsonar-base/apt/pom.xml
===================================================================
--- trunk/perfsonar-base/apt/pom.xml 2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/perfsonar-base/apt/pom.xml 2013-03-19 21:29:00 UTC (rev 6225)
@@ -1,17 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
-
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<groupId>net.geant.perfsonar.base</groupId>
<artifactId>apt</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <name>perfSONAR base 3 APT</name>
+ <description>The psBase3 Annotation Processing Tool</description>
+ <packaging>jar</packaging>

<build>
<plugins>
@@ -29,12 +31,6 @@

<dependencies>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.geant.perfsonar.base</groupId>
<artifactId>annotations</artifactId>
<version>3.0.0-SNAPSHOT</version>
@@ -58,16 +54,16 @@
<version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>

- <description>The psBase3 Annotation Processing Tool</description>
- <name>perfSONAR base 3 APT</name>
- <version>3.0.0-SNAPSHOT</version>
</project>
\ No newline at end of file

Modified: trunk/perfsonar-base/base/pom.xml
===================================================================
--- trunk/perfsonar-base/base/pom.xml 2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/perfsonar-base/base/pom.xml 2013-03-19 21:29:00 UTC (rev 6225)
@@ -5,16 +5,17 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<groupId>net.geant.perfsonar.base</groupId>
<artifactId>base</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <name>perfSONAR base 3</name>
+ <description>The base framework for perfSONAR services</description>
<packaging>bundle</packaging>

-
<developers>
<developer>
<id>blazej.pietrzak</id>
@@ -41,63 +42,53 @@
<artifactId>cglib</artifactId>
<version>2.2.2</version>
</dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>net.geant.perfsonar.base</groupId>
+ <artifactId>messaging</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <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>
- <dependency>
- <groupId>net.geant.perfsonar.base</groupId>
- <artifactId>messaging</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.4.2</version>
- <scope>test</scope>
- </dependency>
</dependencies>

<build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <proc>none</proc>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <proc>none</proc>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -121,6 +112,4 @@
</plugin>
</plugins>
</build>
- <description>The base framework for perfSONAR services</description>
- <name>perfSONAR base 3</name>
</project>

Modified: trunk/perfsonar-base/ls/pom.xml
===================================================================
--- trunk/perfsonar-base/ls/pom.xml 2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/perfsonar-base/ls/pom.xml 2013-03-19 21:29:00 UTC (rev 6225)
@@ -5,15 +5,16 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<groupId>net.geant.perfsonar.base</groupId>
<artifactId>ls</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <name>perfSONAR base 3 LS client</name>
+ <description>Functions to register, update and remove service
information from perfSONAR LS service</description>
<packaging>bundle</packaging>
-

<developers>
<developer>
@@ -30,10 +31,6 @@
</developer>
</developers>

- <properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>net.geant.perfsonar.base</groupId>
@@ -45,6 +42,11 @@
<artifactId>messaging</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>net.geant.perfsonar.base</groupId>
<artifactId>base</artifactId>
@@ -59,29 +61,27 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.4.2</version>
- <type>bundle</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <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>
@@ -99,6 +99,4 @@
</plugin>
</plugins>
</build>
- <description>Functions to register, update and remove service
information from perfSONAR LS service</description>
- <name>perfSONAR base 3 LS client</name>
</project>

Modified: trunk/perfsonar-base/messaging/pom.xml
===================================================================
--- trunk/perfsonar-base/messaging/pom.xml 2013-03-15 01:40:26 UTC (rev
6224)
+++ trunk/perfsonar-base/messaging/pom.xml 2013-03-19 21:29:00 UTC (rev
6225)
@@ -5,15 +5,16 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<groupId>net.geant.perfsonar.base</groupId>
<artifactId>messaging</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <name>perfSONAR base 3 messaging</name>
+ <description>Library for serialization and deserialization of perfSONAR
messages.</description>
<packaging>bundle</packaging>
-

<developers>
<developer>
@@ -30,10 +31,6 @@
</developer>
</developers>

- <properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>jlibs</groupId>
@@ -74,32 +71,27 @@
<artifactId>jlibs-xmldog</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.8.2</version>
- </dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </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>
@@ -117,7 +109,8 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version> <!-- Groovy Eclipse
Compiler does not work with 3.0 -->
+
<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>
@@ -146,6 +139,4 @@
</plugin>
</plugins>
</build>
- <description>Library for serialization and deserialization of
perfSONAR messages.</description>
- <name>perfSONAR base 3 messaging</name>
</project>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control
2013-03-15 01:40:26 UTC (rev 6224)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control
2013-03-19 21:29:00 UTC (rev 6225)
@@ -1,7 +1,7 @@
Source: perfsonar-java-rrd-ma
Section: web
Priority: extra
-Maintainer: Gerd Behrmann
<>
+Maintainer: Antoine Delvaux
<>
Build-Depends: debhelper (>= 5), maven | maven2
Standards-Version: 3.7.2


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-03-15 01:40:26
UTC (rev 6224)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-03-19 21:29:00
UTC (rev 6225)
@@ -6,7 +6,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

@@ -23,7 +23,7 @@
<configurationFile>configuration-ma.xml</configurationFile>
<axis2Id>axis2-1.4.1</axis2Id>
<aar.name>${project.artifactId}</aar.name>
-
<version.nmwg-sql-converter>1.0.1-SNAPSHOT</version.nmwg-sql-converter>
+ <version.nmwg-sql-converter>1.0.1</version.nmwg-sql-converter>
<slf4j.version>1.6.6</slf4j.version>
<installName>perfsonar-java-rrd-ma</installName>
<installPath>/usr/lib/perfsonar/services/${installName}</installPath>
@@ -222,7 +222,7 @@
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-java-base2</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>

<dependency>
@@ -296,14 +296,14 @@
<configuration>

<deb>[[buildDir]]/[[installName]]_[[version]]_all.[[extension]]</deb>
<timestamped>true</timestamped>
- <verbose>false</verbose>
+ <verbose>true</verbose>
<dataSet>
<data>

<src>${project.build.directory}/${project.build.finalName}</src>
<type>directory</type>
<mapper>
<type>perm</type>
-
<prefix>${installPath)</prefix>
+
<prefix>${installPath}</prefix>
</mapper>
</data>
<data>

Modified: trunk/perfsonar-java-rrd-ma-base3/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-base3/pom.xml 2013-03-15 01:40:26 UTC (rev
6224)
+++ trunk/perfsonar-java-rrd-ma-base3/pom.xml 2013-03-19 21:29:00 UTC (rev
6225)
@@ -5,14 +5,19 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
+
<artifactId>perfsonar-java-rrd-ma-base3</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>perfSONAR RRD MA with base3</name>
<description>perfSONAR Measurement Archive with Round Robin Database
backend built around perfSONAR base 3.</description>
+ <packaging>war</packaging>

+ <properties>
+ <packageName>${project.artifactId}</packageName>
+ </properties>
<build>

<finalName>${project.artifactId}</finalName>
@@ -20,7 +25,8 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version> <!-- Groovy Eclipse Compiler does
not work with 3.0 -->
+ <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>
@@ -36,6 +42,27 @@
</dependencies>
</plugin>

+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin-component</artifactId>
+ </overlay>
+ </overlays>
+ <webResources>
+ <resource>
+ <directory>${basedir}/doc</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <targetPath>doc</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-checkstyle-plugin</artifactId>
@@ -87,22 +114,19 @@
<artifactId>ls</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin-component</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <classifier>classes</classifier>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin-component</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <type>war</type>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>

<dependency>
<groupId>net.geant.perfsonar.base</groupId>
@@ -118,22 +142,22 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>2.4.2</version>
<scope>test</scope>
</dependency>


Added:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/configuration.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/configuration.xml
2013-03-19 21:29:00 UTC (rev 6225)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M
2010-03-18 12:05:18Z (local) $ --><configuration
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+ <service name="rrd-ma">
+
+ <!-- Lookup Service information to register the service -->
+ <lookupInformation>
+ <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
+ <!-- If you have a production service in the GEANT domain, you might
want to use the following address for registration -->
+ <!--
http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService -->
+ <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+ <option name="serviceType" value="RRD_MA"/>
+ <option name="lsAddress-1"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+ <!-- Additional LS addresses for multiple registrations -->
+ <option name ="lsAddress-2"></option>
+ <option name ="lsAddress-3"></option>
+ <option name ="lsAddress-4"></option>
+ <option name="interval" value="3500"/> <!-- sec -->
+ </lookupInformation>
+
+ <!-- Metadata Database connection information -->
+ <metadataDBInformation>
+ <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"/>
+ </metadataDBInformation>
+
+ <!--
....................................................................................
-->
+
+ <!-- Additional auxiliary components -->
+
+ <auxiliaryComponents>
+
+ <component
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent"
name="exist">
+ <option name="dataStorageClassName"
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+ <option name="uri"
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
+ <option name="username" value="rrdmaservice"/>
+ <option name="password" value="rrdmaservice"/>
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
name="queryGeneratorManager">
+ <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+ <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+ <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+ <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ </component>
+
+ <component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
+ <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">
+ <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"/>
+ </component>
+
+ <!-- Scheduler -->
+ <component
className="org.perfsonar.base2.service.scheduler.SchedulingComponent"
name="scheduling">
+
+ <option name="schedulerClassName"
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+ <option name="interval" value="1800"/> <!-- sec -->
+
+ <actions>
+
+ <action
className="org.perfsonar.base2.service.registration.LSRegistrationAction"
name="registration">
+
+ <option name="status" value="on"/>
+ <option name="interval" value="3500"/> <!-- sec -->
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+ <option name="lsAddress-1"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+ <!--
+ <option name ="lsAddress-2"></option>
+ <option name ="lsAddress-3"></option>
+ <option name ="lsAddress-4"></option>
+ <option name ="lsAddress-5"></option>
+ -->
+
+ </action>
+
+ </actions>
+ </component>
+
+
+ </auxiliaryComponents>
+
+
+
+ <!--
....................................................................................
-->
+
+
+ <!-- Protocol mappings, XML elements and their bingings -->
+
+ <protocolMappings>
+
+ <!-- default mapping -->
+ <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+ <!-- general mappings -->
+ <element mapping="org.perfsonar.base2.xml.nmwg.Message"
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Metadata"
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.EventType"
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Data"
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameter"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Key"
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.Element"
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+ </protocolMappings>
+
+ <!--
....................................................................................
-->
+
+
+ </service>
+
+
+</configuration>


Property changes on:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/configuration.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/log4j.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/log4j.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/log4j.xml
2013-03-19 21:29:00 UTC (rev 6225)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";>
+
+<!-- This is the configuration for LOG4J for perfSONAR development purposes
-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+
+ <!-- Section: APPENDERS -->
+
+ <!--
+ writes log messages to the console. It outputs file name,
+ method name and line number of the caller. This is slow,
+ so just use it for debugging.
+ -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d - [%p] %c{1}[%M]:%L -
%m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for perfSONAR -->
+ <appender name="perfsonar" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/perfsonar.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for the WebAdmin -->
+ <appender name="webadmin" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/webadmin.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for pSbase -->
+ <appender name="perfsonar-base"
class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/psbase.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- Disabling verbose logging from included libs -->
+ <category name="org" additivity="true">
+ <priority value="warn"/>
+ <appender-ref ref="console"/>
+ </category>
+
+ <!-- perfSONAR WebAdmin -->
+ <category name="org.perfsonar.webadmin" additivity="true">
+ <level value="debug"/>
+ <appender-ref ref="webadmin"/>
+ </category>
+
+ <!-- perfSONAR MA -->
+ <category name="net.geant.perfsonar.ma" additivity="true">
+ <level value="debug"/>
+ <appender-ref ref="perfsonar"/>
+ </category>
+
+ <!-- perfSONAR base -->
+ <category name="net.geant.perfsonar.base">
+ <priority value="debug"/>
+ <appender-ref ref="perfsonar-base"/>
+ </category>
+
+
+ <!-- All other messages are going to the perfsonar log (root logger) -->
+ <root>
+ <level value="debug"/>
+ <appender-ref ref="console"/>
+ </root>
+
+</log4j:configuration>


Property changes on:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/log4j.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/rrdma_db.sql
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/rrdma_db.sql
2013-03-19 21:29:00 UTC (rev 6225)
@@ -0,0 +1,42 @@
+# running:
+# mysql -u root -p < rrdma_db.sql
+
+CREATE DATABASE IF NOT EXISTS
+ perfsonar_rrdma;
+
+USE perfsonar_rrdma
+
+
+#CREATE USER IF NOT EXISTS
+# perfsonar_rrdma;
+
+
+GRANT
+ SELECT, INSERT, UPDATE, DELETE ON
+ perfsonar_rrdma.* TO 'perfsonar_rrdma'@'localhost'
+ IDENTIFIED BY 'testpass';
+
+
+CREATE TABLE IF NOT EXISTS
+ interfaces
+ (metadataId INT NOT NULL AUTO_INCREMENT,
+ subjId VARCHAR(20) NOT NULL,
+ hostName VARCHAR(20) NOT NULL,
+ ifAddress VARCHAR(20) NOT NULL,
+ ifAddressType VARCHAR(4) NOT NULL,
+ ifName VARCHAR(100) NOT NULL,
+ ifDescription VARCHAR(255) NOT NULL,
+ direction VARCHAR(20) NOT NULL,
+ capacity VARCHAR(20) NOT NULL,
+ keyword VARCHAR(100),
+ eventType VARCHAR(100) NOT NULL,
+ file VARCHAR(100) NOT NULL,
+ dataSource VARCHAR(20) NOT NULL,
+ valueUnits VARCHAR(20) NOT NULL,
+ dataSourceStep VARCHAR(20),
+ dataSourceType VARCHAR(20),
+ dataSourceHeartbeat VARCHAR(20),
+ dataSourceMinValue VARCHAR(20),
+ dataSourceMaxValue VARCHAR(20),
+ PRIMARY KEY (metadataId));
+

Added:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
2013-03-19 21:29:00 UTC (rev 6225)
@@ -0,0 +1,38 @@
+# 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','first',
'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','', '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-hostName2',
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000','first',
'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-hostName2',
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test1', 'out',
+'1000000000','', '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');
+
+

Added:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-03-19 21:29:00 UTC (rev 6225)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>
+
+ <!-- service information consists of name and version (only for
displaying purpose) and accessPoint - selfTest -->
+ <wa:serviceInformation>
+
<wa:accessPoint>http://localhost:%PORT%/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
+ <wa:serviceName>RRD MA Service</wa:serviceName>
+ <wa:version>to be filled</wa:version>
+ </wa:serviceInformation>
+
+ <!-- credential for WA -->
+ <wa:credential>
+ <wa:username>perfsonaruser</wa:username>
+ <wa:password>perfsonarpass</wa:password>
+ </wa:credential>
+
+ <wa:basiclink>
+ <wa:pageId>basic</wa:pageId> <!-- page identifier -->
+ <wa:title>Service Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
+ <wa:title>WebAdmin Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:servletId>initDb</wa:servletId>
+ <wa:title>Init Metadata DB</wa:title>
+ </wa:basiclink>
+
+ <wa:advancedlink>
+ <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
+ <wa:title>Detailed Settings</wa:title>
+ </wa:advancedlink>
+
+ <wa:map>
+
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
+ <wa:ns>ns1</wa:ns>
+ </wa:map>
+
+ <wa:map>
+
<wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
+ <wa:ns>webAdmin</wa:ns>
+ </wa:map>
+
+ <wa:page>
+ <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
+ <wa:title><wa:text>Change Password</wa:text></wa:title>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Username</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:password>
+ <wa:title><wa:text>Password</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
+ </wa:xpath></wa:default>
+ </wa:password></wa:plain>
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId><wa:text>basic</wa:text></wa:pageId>
+ <wa:title><wa:text>Basic configuration</wa:text></wa:title>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Access point</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Service name</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Service type</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Lookup Service URL</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:lookupInformation/ns1:option[@name="lsAddress-1"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+
+
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>DB username</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:metadataDBInformation/ns1:option[@name="username"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>DB password</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:metadataDBInformation/ns1:option[@name="password"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
+ <wa:title><wa:text>Advanced settings</wa:text></wa:title>
+
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>DB URI</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:metadataDBInformation/ns1:option[@name="uri"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>DB schema</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:metadataDBInformation/ns1:option[@name="schema"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>LS registration interval</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/net/geant/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="rrd-ma"]/ns1:lookupInformation/ns1:option[@name="interval"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ </wa:page>
+
+</wa:WebAdminInterface>


Property changes on:
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf/webAdminConfig.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle/checkstyle.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle/checkstyle.xml
(rev 0)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle/checkstyle.xml
2013-03-19 21:29:00 UTC (rev 6225)
@@ -0,0 +1,201 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";>
+
+<!--
+ Based on the default checkstyle configuration, but with minor
+ modifications based on established conventions in existing
+ perfSONAR (XML-LS) code.
+-->
+
+<!--
+
+ Checkstyle configuration that checks the sun coding conventions from:
+
+ - the Java Language Specification at
+ http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+ - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+ - the Javadoc guidelines at
+ http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+ - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+ - some best practices
+
+ Checkstyle is very configurable. Be sure to read the documentation at
+ http://checkstyle.sf.net (or in your downloaded distribution).
+
+ Most Checks are configurable, be sure to consult the documentation.
+
+ To completely disable a check, just comment it out or delete it from the
file.
+
+ Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+ <!--
+ If you set the basedir property below, then all reported file
+ names will be relative to the specified directory. See
+ http://checkstyle.sourceforge.net/5.x/config.html#Checker
+
+ <property name="basedir" value="${basedir}"/>
+ -->
+
+ <!-- Checks that a package-info.java file exists for each package.
-->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+ <!--module name="JavadocPackage"/-->
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <module name="NewlineAtEndOfFile"/>
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength"/>
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="FileTabCharacter"/>
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="RegexpSingleline">
+ <!-- I only want lines with *code* reported with trailing spaces, not
for empty ones or empty comment lines -->
+ <property name="format" value="[^[:space:]\*]+\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <!-- <module name="Header"> -->
+ <!-- <property name="headerFile" value="${checkstyle.header.file}"/>
-->
+ <!-- <property name="fileExtensions" value="java"/> -->
+ <!-- </module> -->
+
+ <module name="TreeWalker">
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <!--module name="JavadocMethod"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/-->
+ <module name="JavadocStyle">
+ <property name="checkFirstSentence" value="false"/>
+ </module>
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <!-- 80 is waaaayyyyy too short on current screens standards, HD
you know? -->
+ <property name="max" value="150"/>
+ </module>
+ <module name="MethodLength">
+ <!-- We have one method too long for the default value -->
+ <property name="max" value="190"/>
+ </module>
+ <module name="ParameterNumber"/>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="GenericWhitespace"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="tokens"
+
value="LITERAL_DO,LITERAL_FINALLY,LITERAL_ELSE,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <!--<module name="AvoidInlineConditionals"/>-->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField">
+ <property name="tokens" value="VARIABLE_DEF"/>
+ </module>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <!-- I'm not interested in defining constants for every other
number that appears in my code -->
+ <!--<module name="MagicNumber"/>-->
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows">
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!--module name="DesignForExtension"/-->
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <!-- <module name="FinalParameters"/> -->
+ <!-- I don't want the TODO comments being reported by CheckStyle -->
+ <!--<module name="TodoComment"/>-->
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>


Property changes on:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle/checkstyle.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml 2013-03-15 01:40:26 UTC (rev
6224)
+++ trunk/perfsonar-java-web-admin/pom.xml 2013-03-19 21:29:00 UTC (rev
6225)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

@@ -51,10 +51,6 @@
</developer>
</developers>

- <properties>
- <log4j.version>1.2.17</log4j.version>
- </properties>
-
<build>
<pluginManagement>
<plugins>
@@ -75,44 +71,4 @@
</pluginManagement>
</build>

- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jms</artifactId>
- <groupId>javax.jms</groupId>
- </exclusion>
- <exclusion>
-
<artifactId>jmxtools</artifactId>
-
<groupId>com.sun.jdmk</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jmxri</artifactId>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6225 - in trunk: . nmwg-sql-converter parent perfsonar-base/annotations perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/packaging/deb perfsonar-java-rrd-ma-base3 perfsonar-java-rrd-ma-base3/src/main/resources perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar perfsonar-java-rrd-ma-base3/src/main/resources/perfsonar/conf perfsonar-java-web-admin perfsonar-java-web-admin/perfsonar-java-web-admin-component/src perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/checkstyle, svn-noreply, 03/19/2013

Archive powered by MHonArc 2.6.16.

Top of Page