Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3267 - in trunk/rnp_java-cl-mp: ant conf

Subject: perfsonar development work

List archive

perfsonar: r3267 - in trunk/rnp_java-cl-mp: ant conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3267 - in trunk/rnp_java-cl-mp: ant conf
  • Date: Thu, 24 Jan 2008 23:44:22 -0500
Author: fernandes
Date: 2008-01-24 23:44:21 -0500 (Thu, 24 Jan 2008)
New Revision: 3267

Modified:
trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
trunk/rnp_java-cl-mp/ant/compile-targets.xml
trunk/rnp_java-cl-mp/ant/const.properties.template
trunk/rnp_java-cl-mp/ant/libs-download-targets.xml
trunk/rnp_java-cl-mp/ant/test-targets.xml
trunk/rnp_java-cl-mp/conf/eventType-map.xml
Log:
fixing targets for CL-MP 2.0.
Decided for 2.0 instead of 1.2 since old eventTypes (not fully qualified) are
not supported anymore (since SQL-MA won't support them).

Modified: trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-01-24 18:29:04
UTC (rev 3266)
+++ trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-01-25 04:44:21
UTC (rev 3267)
@@ -48,8 +48,8 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071016/perfsonar-base-1.0.20071016.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <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.20080124/perfsonar-base-1.0.20080124.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

@@ -225,4 +225,4 @@
</target>


-</project>
\ No newline at end of file
+</project>

Modified: trunk/rnp_java-cl-mp/ant/compile-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/compile-targets.xml 2008-01-24 18:29:04
UTC (rev 3266)
+++ trunk/rnp_java-cl-mp/ant/compile-targets.xml 2008-01-25 04:44:21
UTC (rev 3267)
@@ -50,4 +50,4 @@
</target>


-</project>
\ No newline at end of file
+</project>

Modified: trunk/rnp_java-cl-mp/ant/const.properties.template
===================================================================
--- trunk/rnp_java-cl-mp/ant/const.properties.template 2008-01-24 18:29:04
UTC (rev 3266)
+++ trunk/rnp_java-cl-mp/ant/const.properties.template 2008-01-25 04:44:21
UTC (rev 3267)
@@ -11,7 +11,7 @@
service.name=perfSONAR-CLMP

jarfilename=perfsonar-clmp
-version=1.2
+version=2.0

wsdd.file.deploy=service-deploy.wsdd
wsdd.file.undeploy=service-undeploy.wsdd

Modified: trunk/rnp_java-cl-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2008-01-24 18:29:04
UTC (rev 3266)
+++ trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2008-01-25 04:44:21
UTC (rev 3267)
@@ -54,8 +54,8 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071016"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080124"/>
+ <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080124"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
@@ -73,4 +73,4 @@
</target>


-</project>
\ No newline at end of file
+</project>

Modified: trunk/rnp_java-cl-mp/ant/test-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/test-targets.xml 2008-01-24 18:29:04 UTC (rev
3266)
+++ trunk/rnp_java-cl-mp/ant/test-targets.xml 2008-01-25 04:44:21 UTC (rev
3267)
@@ -55,12 +55,9 @@
</target>


- <!--
===================================================================================
-->
- <!-- utilization -->
+ <!--
===================================================================================

+

-
- <!-- ping -->
-
<target name="ping-test"
depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
@@ -72,7 +69,6 @@
</java>
</target>

- <!-- traceroute -->

<target name="traceroute-test"
depends="init-test">
@@ -85,7 +81,6 @@
</java>
</target>

- <!-- owamp -->

<target name="owamp-test"
depends="init-test">
@@ -98,7 +93,6 @@
</java>
</target>

- <!-- bwctl -->

<target name="bwctl-test"
depends="init-test">
@@ -110,7 +104,7 @@
<arg value="${basedir}/samples/requests/response-6.xml"/>
</java>
</target>
-
+ -->
<!--
===================================================================================
-->
<!-- main target -->

@@ -119,10 +113,6 @@

<antcall target="echo-test"/>
<antcall target="lookup-info-test"/>
- <antcall target="ping-test"/>
- <antcall target="traceroute-test"/>
- <antcall target="owamp-test"/>
- <antcall target="bwctl-test"/>

</target>


Modified: trunk/rnp_java-cl-mp/conf/eventType-map.xml
===================================================================
--- trunk/rnp_java-cl-mp/conf/eventType-map.xml 2008-01-24 18:29:04 UTC (rev
3266)
+++ trunk/rnp_java-cl-mp/conf/eventType-map.xml 2008-01-25 04:44:21 UTC (rev
3267)
@@ -18,11 +18,6 @@
</eventType>

<eventType>
- <name>http://ggf.org/ns/nmwg/tools/owamp/summary/2.0</name>
-
<class>org.perfsonar.service.measurementPoint.commandLine.tools.OwampSummary</class>
- </eventType>
-
- <eventType>
<name>http://ggf.org/ns/nmwg/tools/bwctl/2.0</name>

<class>org.perfsonar.service.measurementPoint.commandLine.tools.Bwctl</class>
</eventType>
@@ -32,25 +27,4 @@

<class>org.perfsonar.service.measurementPoint.commandLine.tools.Cron</class>
</eventType>

- <!-- Old eventTypes for compatibility -->
- <eventType>
- <name>ping</name>
-
<class>org.perfsonar.service.measurementPoint.commandLine.tools.Ping</class>
- </eventType>
-
- <eventType>
- <name>owamp</name>
-
<class>org.perfsonar.service.measurementPoint.commandLine.tools.Owamp</class>
- </eventType>
-
- <eventType>
- <name>bwctl</name>
-
<class>org.perfsonar.service.measurementPoint.commandLine.tools.Bwctl</class>
- </eventType>
-
- <eventType>
- <name>traceroute</name>
-
<class>org.perfsonar.service.measurementPoint.commandLine.tools.Traceroute</class>
- </eventType>
-
-</eventType-config>
\ No newline at end of file
+</eventType-config>


  • perfsonar: r3267 - in trunk/rnp_java-cl-mp: ant conf, svnlog, 01/24/2008

Archive powered by MHonArc 2.6.16.

Top of Page