Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4450 - in trunk/geant2_java-as: . ant

Subject: perfsonar development work

List archive

perfsonar: r4450 - in trunk/geant2_java-as: . ant


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4450 - in trunk/geant2_java-as: . ant
  • Date: Fri, 5 Sep 2008 06:20:14 -0400
Author: rodriguez
Date: 2008-09-05 06:20:14 -0400 (Fri, 05 Sep 2008)
New Revision: 4450

Modified:
trunk/geant2_java-as/ant/axis-deploy-targets.xml
trunk/geant2_java-as/ant/libs-download-targets.xml
trunk/geant2_java-as/ant/webapp-package-targets.xml
trunk/geant2_java-as/pom.xml
Log:
Updating ant scripts
Updating maven script

Modified: trunk/geant2_java-as/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/axis-deploy-targets.xml 2008-09-05 10:14:54
UTC (rev 4449)
+++ trunk/geant2_java-as/ant/axis-deploy-targets.xml 2008-09-05 10:20:14
UTC (rev 4450)
@@ -52,7 +52,7 @@

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

Modified: trunk/geant2_java-as/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/libs-download-targets.xml 2008-09-05 10:14:54
UTC (rev 4449)
+++ trunk/geant2_java-as/ant/libs-download-targets.xml 2008-09-05 10:20:14
UTC (rev 4450)
@@ -55,14 +55,14 @@
<artifact:dependencies>

<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080310"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.1b"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080124"/>

<!-- dependencies for perfsonar-web-admin -->
<dependency groupId="commons-io"
artifactId="commons-io" version="1.3.2"/>
<dependency groupId="commons-codec"
artifactId="commons-codec" version="1.3"/>
<dependency groupId="commons-fileupload"
artifactId="commons-fileupload" version="1.2"/>
- <dependency groupId="perfsonar"
artifactId="perfsonar-web-admin" version="0.9b"/>
+ <dependency groupId="perfsonar"
artifactId="perfsonar-web-admin" version="0.9.1b"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Modified: trunk/geant2_java-as/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-09-05 10:14:54
UTC (rev 4449)
+++ trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-09-05 10:20:14
UTC (rev 4450)
@@ -66,7 +66,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2_java-as/pom.xml
===================================================================
--- trunk/geant2_java-as/pom.xml 2008-09-05 10:14:54 UTC (rev 4449)
+++ trunk/geant2_java-as/pom.xml 2008-09-05 10:20:14 UTC (rev 4450)
@@ -103,7 +103,16 @@
<resource>
<directory>${basedir}/conf/</directory>
<includes>
- <include>**/*</include>
+ <include>ASValidComponentsFile</include>
+ <include>components.properties</include>
+ <include>log4j.properties</include>
+ <include>log4j.syslog.properties</include>
+ <include>objects.config</include>
+ <include>perfSONARtruststore.jks</include>
+ <include>service.properties</include>
+ <include>servlet.properties</include>
+ <include>wizard.properties</include>
+ <include>wizardproperties.dtd</include>
</includes>
<excludes>
<exclude>axis-1.4/**/*</exclude>
@@ -111,6 +120,13 @@
</excludes>
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
</resource>
+ <resource>
+ <directory>${basedir}/samples/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>WEB-INF/samples</targetPath>
+ </resource>
</webResources>
<webXml>${basedir}/conf/axis-1.4/WEB-INF/web.xml</webXml>
</configuration>
@@ -124,6 +140,11 @@

<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
</repository>
<repository>
+ <id>maven2</id>
+ <name>maven2 repository</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ <repository>
<id>personar_leg</id>
<name>personar repository</name>

<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
@@ -144,7 +165,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9b</version>
+ <version>0.9.1b</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -162,6 +183,201 @@
<version>1.2</version>
</dependency>
<dependency>
+ <groupId>nmwg</groupId>
+ <artifactId>nmwg</artifactId>
+ <version>1.0.20080124</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-ant</artifactId>
+ <version>1.4</version>
+ </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>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.02</version>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0b8</version>
+ </dependency>
+ <dependency>
+ <groupId>urbanophile</groupId>
+ <artifactId>java-getopt</artifactId>
+ <version>1.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.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>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>5.0.28</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>124</version>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javolution</groupId>
+ <artifactId>javolution</artifactId>
+ <version>3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>2.0-TP2-jdk-1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>xmltooling</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.0-TP2-jdk-1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml1</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>edugain</groupId>
+ <artifactId>edugain</artifactId>
+ <version>0.7alpha</version>
+ </dependency>
+ <dependency>
+ <groupId>sasl-ca</groupId>
+ <artifactId>sasl-ca</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>codec</groupId>
+ <artifactId>codec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibatis</groupId>
+ <artifactId>ibatis-common</artifactId>
+ <version>2.1.7.597</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-jdom</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>


  • perfsonar: r4450 - in trunk/geant2_java-as: . ant, svnlog, 09/05/2008

Archive powered by MHonArc 2.6.16.

Top of Page