Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2357 - trunk/perfsonar/ant/sqlma

Subject: perfsonar development work

List archive

perfsonar: r2357 - trunk/perfsonar/ant/sqlma


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2357 - trunk/perfsonar/ant/sqlma
  • Date: Wed, 25 Apr 2007 10:01:04 -0400
Author: roman
Date: 2007-04-25 10:01:04 -0400 (Wed, 25 Apr 2007)
New Revision: 2357

Modified:
trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
Log:

request of type LookupInfoRequest supported in SQL MA




Modified: trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml 2007-04-25
13:43:42 UTC (rev 2356)
+++ trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml 2007-04-25
14:01:04 UTC (rev 2357)
@@ -21,14 +21,43 @@
<property name="ma.local"
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>


+ <!-- echo -->
+
+
+ <target name="run-echo">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>
+ </java>
+ </target>
+
+
+ <!-- lookup info -->
+
+
+ <target name="run-lookup-info">
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/LookupInfo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>
+ </java>
+
+ </target>
+
+
<!-- utilization -->

+
<target name="run-sqlma-client-key-util">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Req.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>
</java>
</target>

@@ -38,7 +67,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>
</java>
</target>

@@ -48,7 +77,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>
</java>
</target>

@@ -58,7 +87,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-6.xml"/>
</java>
</target>

@@ -68,7 +97,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-7.xml"/>
</java>
</target>

@@ -81,7 +110,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-6.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-8.xml"/>
</java>
</target>

@@ -91,7 +120,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-7.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-9.xml"/>
</java>
</target>

@@ -101,7 +130,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-8.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-10.xml"/>
</java>
</target>

@@ -111,7 +140,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-9.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-11.xml"/>
</java>
</target>

@@ -121,7 +150,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-10.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-12.xml"/>
</java>
</target>

@@ -131,7 +160,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-11.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-13.xml"/>
</java>
</target>

@@ -141,7 +170,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-12.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-14.xml"/>
</java>
</target>

@@ -151,7 +180,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-13.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-15.xml"/>
</java>
</target>

@@ -161,7 +190,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-14.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-16.xml"/>
</java>
</target>

@@ -171,22 +200,12 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-15.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-17.xml"/>
</java>
</target>


- <target name="run-echo">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath" fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
- </java>
- </target>

-
-
</project>



Modified: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml 2007-04-25
13:43:42 UTC (rev 2356)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml 2007-04-25
14:01:04 UTC (rev 2357)
@@ -97,17 +97,20 @@
<propertyfile file="conf/service.properties"
comment="This file was created by the Ant
configuration script.">

- <entry key="service.r.type" value="ma"/>
- <entry key="service.r.service_name" value="Java SQL MA"/>
- <entry key="service.r.service_type" value="SQL MA"/>
- <entry key="service.r.service_description" value="Java SQL MA,
perfSONAR project"/>
-
+ <!-- first two properties:
-->
+ <!-- do want to keep both properties which are almost the
same -->
+ <!-- needs to be checked
-->
+ <entry key="service.r.type" value="ma"/>
+ <entry key="service.r.service_type" value="SQL MA"/>
+ <entry key="service.r.service_name" value="${service.name}"/>
+ <entry key="service.r.service_version"
value="${service.version}${service.version.candidate}"/>
+
<entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
<entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>

- <entry key="service.ma.conf_file"
value="${sql.config.file}"/>
- <entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest"/>
- <entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine"/>
+ <entry key="service.ma.conf_file"
value="${sql.config.file}"/>
+ <entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest"/>
+ <entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine"/>

<entry key="service.ma.xmldb.db_store" value="off"/>

@@ -267,6 +270,7 @@
<antcall target="accessing-relational-database-setup"/>
<antcall target="store-fuctionality-for-sqlma"/>
<antcall target="register-fuctionality-for-sqlma"/>
+ <antcall target="set-service-descr-email-organization"/>

</target>


Modified: trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml 2007-04-25
13:43:42 UTC (rev 2356)
+++ trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml 2007-04-25
14:01:04 UTC (rev 2357)
@@ -21,7 +21,10 @@
<!-- properties -->


- <property name="service.name" value="perfSONAR-SQL-MA-1.0-beta" />
+ <property name="service.base.name" value="SQL-MA" />
+ <property name="service.version" value="1.1" />
+ <property name="service.version.candidate" value="-beta" />
+ <property name="service.name"
value="perfSONAR-${service.base.name}-${service.version}${service.version.candidate}"
/>


<property name="_exist.war.download.url"

Modified: trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml 2007-04-25
13:43:42 UTC (rev 2356)
+++ trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml 2007-04-25
14:01:04 UTC (rev 2357)
@@ -25,10 +25,13 @@
<echo></echo>

<antcall target="run-echo"/>
+ <antcall target="run-lookup-info"/>
+
<antcall target="run-sqlma-client-key-util"/>
<antcall target="run-sqlma-client-data-util-1"/>
<antcall target="run-sqlma-client-data-util-2"/>
<antcall target="run-sqlma-client-data-util-3"/>
+
<antcall target="run-sqlma-client-key-L2status-1"/>
<antcall target="run-sqlma-client-key-L2status-2"/>
<antcall target="run-sqlma-client-key-L2status-3"/>
@@ -45,13 +48,13 @@
<target name="run-mysql-sqlma-test1">
<sql
driver="com.mysql.jdbc.Driver"
- url="jdbc:mysql://localhost/perfsonar_ma"
+ url="jdbc:mysql://gymnocladus.man.poznan.pl/lmbase"
userid="perfsonar_ma"
- password="testpass"
+
password="pErf6on@r"
print="true"
classpathref="classpath">
select version();
- select * from domain_link;
+ select * from domain_link;
</sql>
</target>



  • perfsonar: r2357 - trunk/perfsonar/ant/sqlma, svnlog, 04/25/2007

Archive powered by MHonArc 2.6.16.

Top of Page