Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3786 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant samples/requests

Subject: perfsonar development work

List archive

perfsonar: r3786 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant samples/requests


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3786 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant samples/requests
  • Date: Thu, 24 Apr 2008 05:11:32 -0400
Author: roman
Date: 2008-04-24 05:11:31 -0400 (Thu, 24 Apr 2008)
New Revision: 3786

Added:

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/test-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
Log:
Changes from the rev numbers range 3769:3785 merged.



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-04-24 09:02:48 UTC (rev 3785)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-04-24 09:11:31 UTC (rev 3786)
@@ -46,8 +46,8 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -289,7 +289,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
2008-04-24 09:02:48 UTC (rev 3785)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
2008-04-24 09:11:31 UTC (rev 3786)
@@ -11,7 +11,7 @@
service.name=geant2-java-sql-ma

jarfilename=perfsonar-sql-ma
-version=2.0rc9
+version=2.0rc10

exist.war.file=exist-1.1.1-newcore.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.1.1

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-04-24 09:02:48 UTC (rev 3785)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-04-24 09:11:31 UTC (rev 3786)
@@ -55,7 +55,7 @@
<artifact:dependencies>

<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080422"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.3b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.4b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.0rc2"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/test-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/test-targets.xml 2008-04-24
09:02:48 UTC (rev 3785)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/test-targets.xml 2008-04-24
09:11:31 UTC (rev 3786)
@@ -322,11 +322,59 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml"/>
- <arg value="${basedir}/samples/requests/response-23.xml"/>
+ <arg value="${basedir}/samples/requests/response-23-1.xml"/>
</java>
</target>


+ <target name="L2status-data-store-test-2"
+ depends="init-test">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath"
+ fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml"/>
+ <arg value="${basedir}/samples/requests/response-23-2.xml"/>
+ </java>
+ </target>
+
+
+ <target name="L2status-data-store-test-3"
+ depends="init-test">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath"
+ fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml"/>
+ <arg value="${basedir}/samples/requests/response-23-3.xml"/>
+ </java>
+ </target>
+
+
+ <target name="L2status-data-store-test-4"
+ depends="init-test">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath"
+ fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml"/>
+ <arg value="${basedir}/samples/requests/response-23-4.xml"/>
+ </java>
+ </target>
+
+
+ <target name="L2status-data-store-test-5"
+ depends="init-test">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath"
+ fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-5.xml"/>
+ <arg value="${basedir}/samples/requests/response-23-5.xml"/>
+ </java>
+ </target>
+
+
<!--
===================================================================================
-->
<!-- main target -->


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-04-24 09:02:48 UTC (rev 3785)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-04-24 09:11:31 UTC (rev 3786)
@@ -81,7 +81,7 @@
<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
(from rev 3785,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
(from rev 3785,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
(from rev 3785,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml)


  • perfsonar: r3786 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant samples/requests, svnlog, 04/24/2008

Archive powered by MHonArc 2.6.16.

Top of Page