perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5972 - in trunk: perfsonar-base3-persistence perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r5972 - in trunk: perfsonar-base3-persistence perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend

From:
To:
Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5972 - in trunk: perfsonar-base3-persistence perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend
Date: Wed, 22 Aug 2012 12:10:06 +0100 (BST)

Author: nordunet.behrmann
Date: 2012-08-22 12:10:06 +0100 (Wed, 22 Aug 2012)
New Revision: 5972

Modified:
trunk/perfsonar-base3-persistence/pom.xml
trunk/perfsonar-java-base2/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
Base2,Base3,RRD-MA: Clean up Maven POMs

Upgrade plugins and some dependencies.

Modified: trunk/perfsonar-base3-persistence/pom.xml
===================================================================
--- trunk/perfsonar-base3-persistence/pom.xml 2012-08-21 10:48:10 UTC (rev
5971)
+++ trunk/perfsonar-base3-persistence/pom.xml 2012-08-22 11:10:06 UTC (rev
5972)
@@ -1,247 +1,160 @@
<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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>perfsonar-base3-persistence</artifactId>
- <packaging>jar</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <name>perfSONAR Persistence</name>
- <url>http://www.perfsonar.net/</url>
- <description>Persistence Layer for the perfSONAR services</description>
-
- <developers>
- <developer>
- <id>szwed</id>
- <name>Blazej Pietrzak</name>
-
<email></email>
- <url></url>
- <organization>Poznan Supercomputing and Networking
Center</organization>
- <organizationUrl>http://man.poznan.pl/</organizationUrl>
- <roles>
- <role>designer</role>
- <role>developer</role>
- </roles>
- <timezone>1</timezone>
- <properties>
- <skype>blazej980</skype>
- </properties>
- </developer>
- </developers>
-
- <inceptionYear>2011</inceptionYear>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.geant.net/</url>
- </issueManagement>
-
- <scm>
-
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-base3-persistence</connection>
-
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-base3-persistence</developerConnection>
- 
- <url></url>
- </scm>
-
- <organization>
- <name>Poznan Supercomputing and Networking Center</name>
- <url>http://man.poznan.pl/</url>
- </organization>
-
- 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>perfsonar-base3-persistence</artifactId>
+ <packaging>jar</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>perfSONAR Persistence</name>
+ <url>http://www.perfsonar.net/</url>
+ <description>Persistence Layer for the perfSONAR services</description>

- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>

- 
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.6.1.Final</version>
- </dependency>
+ <inceptionYear>2011</inceptionYear>

- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>3.6.1.Final</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>1.0.0.Final</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.7.1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- </dependency>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.geant.net/</url>
+ </issueManagement>

- </dependencies>
-
- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
-
- <repository>
- <id>jboss-repository</id>
- <name>jboss repository</name>
-
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
- </repository>
-
- <repository>
- <id>geant-repository</id>
- <name>perfSONAR repository</name>
- <url>http://maven.geant.net/repo</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>geant-developers-repository</id>
- <name>perfSONAR repository</name>
-
<url>scpexe:///repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- </distributionManagement>
-
+ <scm>
+
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-base3-persistence</connection>
+
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-base3-persistence</developerConnection>
+ 
+ <url></url>
+ </scm>
+
+ <organization>
+ <name>Poznan Supercomputing and Networking Center</name>
+ <url>http://man.poznan.pl/</url>
+ </organization>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.2</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.6.10.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>3.6.10.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.21</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.7.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.6</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+ </repository>
+
+ <repository>
+ <id>jboss-repository</id>
+ <name>jboss repository</name>
+
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ </repository>
+
+ <repository>
+ <id>geant-repository</id>
+ <name>perfSONAR repository</name>
+ <url>https://artifactory.geant.net/artifactory/geant-repo/</url>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>geant-developers-repository</id>
+ <name>perfSONAR repository</name>
+
<url>scpexe:///repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ </distributionManagement>
</project>

Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml 2012-08-21 10:48:10 UTC (rev 5971)
+++ trunk/perfsonar-java-base2/pom.xml 2012-08-22 11:10:06 UTC (rev 5972)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<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/maven-v4_0_0.xsd";>

@@ -13,7 +12,12 @@
The perfSONAR base provides a number of common, shared classes which
can be used by
MA, MP and Clients.
</description>
-
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
<developers>
<developer>
<id>szwed</id>
@@ -71,21 +75,40 @@
</organization>

<build>
- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <outputDirectory>${basedir}/bin</outputDirectory>
- <directory>${basedir}/build</directory>
+ <outputDirectory>${project.basedir}/bin</outputDirectory>
+ <directory>${project.basedir}/build</directory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
- <version>2.3.2</version>
</plugin>
- </plugins>
- <extensions>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.2</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
@@ -98,7 +121,7 @@
<repository>
<id>ibiblio</id>
<name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
+
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
</repository>
<repository>
<id>geant-repository</id>
@@ -121,7 +144,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -241,12 +264,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
@@ -276,14 +299,14 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
</dependencies>

<reporting>
<excludeDefaults>true</excludeDefaults>
- <outputDirectory>${basedir}/doc/site</outputDirectory>
+ <outputDirectory>${project.basedir}/doc/site</outputDirectory>
<plugins>
<plugin>
<artifactId>
@@ -301,20 +324,20 @@
</reports>
</reportSet>
</reportSets>
- <version>version</version>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>version</version>
+ <version>2.8.1</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>version</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>version</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -322,23 +345,23 @@
<configuration>

<failOnViolation>false</failOnViolation>
</configuration>
- <version>version</version>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
- <linkXref>true</linkXref>
+ <linkXRef>true</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
<targetJdk>1.5</targetJdk>
</configuration>
- <version>version</version>
+ <version>2.7.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>2.5.1</version>
<configuration>

<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
@@ -359,8 +382,4 @@
<uniqueVersion>false</uniqueVersion>
</repository>
</distributionManagement>
- <properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
</project>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-08-21 10:48:10
UTC (rev 5971)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-08-22 11:10:06
UTC (rev 5972)
@@ -1,438 +1,354 @@
<?xml version="1.0" encoding="UTF-8"?>

<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/maven-v4_0_0.xsd";>
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>

- <properties>
- <configurationFile>configuration-ma.xml</configurationFile>
- <axis2Id>axis2-1.4.1</axis2Id>
- </properties>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>perfsonar-java-rrd-ma</artifactId>
+ <packaging>war</packaging>
+ <name>RRD Measurement Archive</name>
+ <version>3.4</version>
+ <description>Round Robin Database Measurement Archive for
+ perfSONAR. For more information see the wiki-page.</description>
+
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_RRD_MA_release_candidate</url>

- <modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>perfsonar-java-rrd-ma</artifactId>
- <packaging>war</packaging>
- <name>RRD Measurement Archive</name>
- <version>3.4</version>
- <description>Round Robin Database Measurement Archive for
- perfSONAR. For more information see the
wiki-page.</description>
-
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_RRD_MA_release_candidate</url>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <configurationFile>configuration-ma.xml</configurationFile>
+ <axis2Id>axis2-1.4.1</axis2Id>
+ </properties>

-
+ <copy
file="${project.basedir}/conf/${configurationFile}"
+ todir="${project.basedir}/conf/tmp" />
+ 
+ <copy
file="${project.basedir}/conf/configuration.xml.template"
+ todir="${project.basedir}/conf/tmp" />
+ <copy
file="${project.basedir}/conf/rrdma_db.sql"
+ todir="${project.basedir}/conf/tmp" />
+ <copy
file="${project.basedir}/conf/test_rrdma_db.sql"
+ todir="${project.basedir}/conf/tmp" />
+ <move
file="${project.basedir}/conf/tmp/${configurationFile}"
+
tofile="${project.basedir}/conf/tmp/configuration.xml" />
+ <copy
file="${project.basedir}/conf/webAdminConfig.xml"
todir="${project.basedir}/conf/tmp"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-aar</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property name="aar.name"
value="${project.artifactId}" />
+ <copy toDir="${project.basedir}/bin"
failonerror="false">
+ <fileset
dir="${project.basedir}/conf/axis2">
+ <include name="**/*.xml" />
+ </fileset>
+ </copy>
+ <mkdir dir="${project.build.directory}" />
+ <jar
destfile="${project.basedir}/build/${aar.name}.aar">
+ <fileset
includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml"
+ dir="${project.basedir}/bin" />
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>

- <organization>
- <name>perfSONAR</name>
- <url>http://www.perfsonar.net</url>
- </organization>
- -->
- <build>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>${project.basedir}/conf/tmp</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/build</directory>
+ <includes>
+ <include>**/*.aar</include>
+ </includes>
+ <targetPath>WEB-INF/services</targetPath>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>axis2-web</targetPath>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/resources/${axis2Id}/repository/modules</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>WEB-INF/modules</targetPath>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/resources/${axis2Id}/conf</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ <targetPath>WEB-INF/conf</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/conf</directory>
+ <includes>
+ 
+ <include>log4j.properties</include>
+ </includes>
+ <targetPath>WEB-INF/classes</targetPath>
+ </resource>
+ </webResources>
+
<webXml>${project.basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
+ </configuration>
+ </plugin>

- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <outputDirectory>${basedir}/bin</outputDirectory>
- <directory>${basedir}/build</directory>
- <finalName>${project.artifactId}</finalName>
+ 
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+
<webApp>${project.build.directory}/${project.artifactId}</webApp>
+ </configuration>
+ </plugin>
+ </plugins>

- <plugins>
+ </build>

- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+ </repository>
+ <repository>
+ <id>personar</id>
+ <name>personar repository</name>
+
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
+ </repository>
+ <repository>
+ <id>codehaus-release-repo</id>
+ <name>Codehaus Release Repo</name>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+ <repository>
+ <id>geant-repository</id>
+ <name>perfSONAR repository</name>
+ <url>https://artifactory.geant.net/artifactory/geant-repo/</url>
+ </repository>

- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-configuration</id>
-
<phase>process-resources</phase>
- <configuration>
- <tasks>
- <delete
dir="${basedir}/conf/tmp" failonerror="false" />
- 
- <copy
file="${basedir}/conf/${configurationFile}" todir="${basedir}/conf/tmp" />
- 
- <copy
file="${basedir}/conf/configuration.xml.template"
-
todir="${basedir}/conf/tmp" />
- <copy
file="${basedir}/conf/rrdma_db.sql"
-
todir="${basedir}/conf/tmp" />
- <copy
file="${basedir}/conf/test_rrdma_db.sql"
-
todir="${basedir}/conf/tmp" />
- <move
file="${basedir}/conf/tmp/${configurationFile}"
-
tofile="${basedir}/conf/tmp/configuration.xml" />
- <copy
file="${basedir}/conf/webAdminConfig.xml" todir="${basedir}/conf/tmp"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>create-aar</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <property
name="aar.name" value="${project.artifactId}" />
- <copy
toDir="${basedir}/bin" failonerror="false">
-
<fileset dir="${basedir}/conf/axis2">
-
<include name="**/*.xml" />
-
</fileset>
- </copy>
- <mkdir
dir="${project.build.directory}" />
- <jar
destfile="${basedir}/build/${aar.name}.aar">
-
<fileset includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml"
-
dir="${basedir}/bin" />
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </repositories>

- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
-
<directory>${basedir}/conf/tmp</directory>
- <includes>
-
<include>**/*</include>
- </includes>
-
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/build</directory>
- <includes>
-
<include>**/*.aar</include>
- </includes>
-
<targetPath>WEB-INF/services</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
- <includes>
-
<include>**/*</include>
- </includes>
-
<targetPath>axis2-web</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/repository/modules</directory>
- <includes>
-
<include>**/*</include>
- </includes>
-
<targetPath>WEB-INF/modules</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/conf</directory>
- <includes>
-
<include>**/*.xml</include>
- </includes>
-
<targetPath>WEB-INF/conf</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/conf</directory>
- <includes>
- 
-
<include>log4j.properties</include>
- </includes>
-
<targetPath>WEB-INF/classes</targetPath>
- </resource>
- </webResources>
-
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>perfsonar-base3-persistence</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>

- 
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
-
<webApp>${project.build.directory}/${project.artifactId}</webApp>
- </configuration>
- </plugin>
- </plugins>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ </dependency>

- </build>
+ <dependency>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>ps-mdm-base2</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>1.4.1</version>
+ </dependency>

- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
-
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
- </repository>
- <repository>
- <id>personar</id>
- <name>personar repository</name>
-
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
- </repository>
- <repository>
- <id>personar_leg</id>
- <name>personar repository</name>
-
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>codehaus-release-repo</id>
- <name>Codehaus Release Repo</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- <repository>
- <id>geant-repository</id>
- <name>perfSONAR repository</name>
-
<url>https://artifactory.geant.net/artifactory/geant-repo/</url>
- </repository>
+ 
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml1</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>124</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>edugain</groupId>
+ <artifactId>edugain</artifactId>
+ <version>1.0-RC2</version>
+ </dependency>
+ <dependency>
+ <groupId>perfsonar</groupId>
+ <artifactId>perfsonar-authr</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>opensaml</artifactId>
+ <groupId>opensaml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk13</artifactId>
+ <groupId>bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>org.apache.santuario</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces-xml-apis</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan-serializer</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xacml</groupId>
+ <artifactId>sunxacml</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>

- </repositories>
-
-
-
-
- <dependencies>
- <dependency>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>perfsonar-base3-persistence</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- </dependency>
-
- <dependency>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>ps-mdm-base2</artifactId>
- <version>1.0.6</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>3.4.0</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>1.4.1</version>
- </dependency>
-
- 
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml1</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>124</version>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>edugain</groupId>
- <artifactId>edugain</artifactId>
- <version>1.0-RC2</version>
- </dependency>
- <dependency>
- <groupId>perfsonar</groupId>
- <artifactId>perfsonar-authr</artifactId>
- <version>0.5</version>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <artifactId>opensaml</artifactId>
- <groupId>opensaml</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bcprov-jdk13</artifactId>
- <groupId>bouncycastle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xmlsec</artifactId>
-
<groupId>org.apache.santuario</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces-xml-apis</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan-serializer</artifactId>
- <version>2.7.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xacml</groupId>
- <artifactId>sunxacml</artifactId>
- <version>1.2</version>
- </dependency>
-
- 
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
-
-
-
- </dependencies>
-
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <outputDirectory>${basedir}/doc/site</outputDirectory>
- <plugins>
- <plugin>
-
<artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
-
<report>summary</report>
-
<report>project-team</report>
-
<report>dependencies</report>
-
<report>mailing-list</report>
-
<report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <configuration>
-
<failOnViolation>false</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <outputDirectory>${project.basedir}/doc/site</outputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>summary</report>
+ <report>project-team</report>
+ <report>dependencies</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <version>2.0</version>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.7.1</version>
+ <configuration>
+ <linkXRef>true</linkXRef>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.6</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>

[pS-dev] [GEANT/SA2/ps-java-services] r5972 - in trunk: perfsonar-base3-persistence perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend, svn-noreply, 08/22/2012

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r5972 - in trunk: perfsonar-base3-persistence perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend