Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2973 - in branches/new-structure/trunk/geant2_java-sql-ma: ant conf samples/requests

Subject: perfsonar development work

List archive

perfsonar: r2973 - in branches/new-structure/trunk/geant2_java-sql-ma: ant conf samples/requests


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2973 - in branches/new-structure/trunk/geant2_java-sql-ma: ant conf samples/requests
  • Date: Thu, 18 Oct 2007 07:36:48 -0400
Author: roman
Date: 2007-10-18 07:36:48 -0400 (Thu, 18 Oct 2007)
New Revision: 2973

Added:

branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml

branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml

branches/new-structure/trunk/geant2_java-sql-ma/conf/service.properties.template
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml

branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml

branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_errors_TEST.xml

branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
Log:
- switch from http to xmlrpc type of communication with xml db
- use of new version of the base
- new parameter eventType in utilization, errors, discards keys




Modified:
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -45,7 +45,7 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071009/perfsonar-base-1.0.20071009.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/perfsonar/perfsonar-rrd-ma/2.3.20071009/perfsonar-rrd-ma-2.3.20071009.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"/>


Modified:
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -54,7 +54,7 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071009"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071016"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="2.3.20071009"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>


Modified:
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -76,8 +76,8 @@

<property file="${basedir}/ant/const.properties" />
<propertyfile file="${basedir}/conf/service.properties">
- <!-- <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
-->
- <entry key="component.ma.xmldb.db_uri"
value="http://localhost:${target.port}/exist/rest/db/sqlmaconfig"/>
+ <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
+ <!-- <entry key="component.ma.xmldb.db_uri"
value="http://localhost:${target.port}/exist/rest/db/sqlmaconfig"/> -->
<entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
<entry key="component.ma.xmldb.type" value="webapp"/>
</propertyfile>
@@ -224,8 +224,8 @@

<property file="${basedir}/ant/const.properties" />
<propertyfile file="${basedir}/conf/service.properties">
- <!-- <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
-->
- <entry key="component.ma.xmldb.db_uri"
value="http://${exist.hostname}:${exist.port}/exist/rest/db/sqlmaconfig"/>
+ <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
+ <!-- <entry key="component.ma.xmldb.db_uri"
value="http://${exist.hostname}:${exist.port}/exist/rest/db/sqlmaconfig"/> -->
<entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
</propertyfile>

@@ -235,8 +235,8 @@
<target name="exist-main-properties">
<propertyfile file="${basedir}/conf/service.properties">
<entry key="component.ma.xmldb.db_status" value="on"/>
- <!-- <entry key="component.ma.xmldb.db_access" value="xmlrpc"/> -->
- <entry key="component.ma.xmldb.db_access" value="http"/>
+ <entry key="component.ma.xmldb.db_access" value="xmlrpc"/>
+ <!-- <entry key="component.ma.xmldb.db_access" value="http"/> -->
</propertyfile>
</target>

@@ -318,8 +318,8 @@

<propertyfile file="${basedir}/conf/service.properties">
<entry key="component.ma.xmldb.type" value="webapp"/>
- <!-- <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://${_exist.hostname}:${_exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
-->
- <entry key="component.ma.xmldb.db_uri"
value="http://${_exist.hostname}:${_exist.port}/exist/rest/db/sqlmaconfig"/>
+ <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://${_exist.hostname}:${_exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
+ <!-- <entry key="component.ma.xmldb.db_uri"
value="http://${_exist.hostname}:${_exist.port}/exist/rest/db/sqlmaconfig"/>
-->
<entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://${_exist.hostname}:${_exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
</propertyfile>


Modified: branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++ branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -69,6 +69,18 @@
</target>


+ <target name="util-metadata-key-fetch-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/MetadataKeyRequest-Utilization-2.xml"/>
+ <arg value="${basedir}/samples/requests/response-all-metadata.xml"/>
+ </java>
+ </target>
+
+
<target name="util-data-fetch-test-1"
depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"

Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/service.properties.template
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/service.properties.template
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/service.properties.template
2007-10-18 11:36:48 UTC (rev 2973)
@@ -7,8 +7,8 @@

service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining

component.ma.xmldb.db_status=off
-#component.ma.xmldb.db_access=xmlrpc
-component.ma.xmldb.db_access=http
+component.ma.xmldb.db_access=xmlrpc
+#component.ma.xmldb.db_access=http
component.ma.xmldb.db_uri=
component.ma.xmldb.db_uri.xmlrpc=
component.ma.xmldb.db_username=sqlmaservice

Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -40,6 +40,7 @@
<nmwg:parameters>
<nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -68,6 +69,7 @@
<nmwg:parameters>
<nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -96,6 +98,7 @@
<nmwg:parameters>
<nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>

Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -30,6 +30,7 @@
<nmwg:parameters>
<nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>

Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_errors_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_errors_TEST.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_errors_TEST.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -30,6 +30,7 @@
<nmwg:parameters>
<nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>

Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
2007-10-18 09:59:10 UTC (rev 2972)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
2007-10-18 11:36:48 UTC (rev 2973)
@@ -35,6 +35,7 @@
<nmwg:parameters>
<nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>

Added:
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml


Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native


  • perfsonar: r2973 - in branches/new-structure/trunk/geant2_java-sql-ma: ant conf samples/requests, svnlog, 10/18/2007

Archive powered by MHonArc 2.6.16.

Top of Page