Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3286 - in branches/GEANT2_JAVA-RRD-MA-STABLE: . ant contrib contrib/perf-client contrib/perf-client/requests doc doc/schema src/main/java/org/perfsonar/service/measurementArchive/rrdType

Subject: perfsonar development work

List archive

perfsonar: r3286 - in branches/GEANT2_JAVA-RRD-MA-STABLE: . ant contrib contrib/perf-client contrib/perf-client/requests doc doc/schema src/main/java/org/perfsonar/service/measurementArchive/rrdType


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3286 - in branches/GEANT2_JAVA-RRD-MA-STABLE: . ant contrib contrib/perf-client contrib/perf-client/requests doc doc/schema src/main/java/org/perfsonar/service/measurementArchive/rrdType
  • Date: Thu, 31 Jan 2008 05:33:40 -0500
Author: roman
Date: 2008-01-31 05:33:40 -0500 (Thu, 31 Jan 2008)
New Revision: 3286

Added:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/configuration.txt

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests.pl

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests_refresh.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/fully/

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/metadataKeyRequest.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/refresh/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/semi/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/single/
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/Functional Testing Specification
Document.doc
Removed:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/configuration.txt

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests.pl

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests_refresh.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/fully/

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/metadataKeyRequest.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/refresh/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/semi/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/single/
Modified:
branches/GEANT2_JAVA-RRD-MA-STABLE/
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/schema/SetupDataResponse.rnc

branches/GEANT2_JAVA-RRD-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:

updated to include recent changes from the trunk





Property changes on: branches/GEANT2_JAVA-RRD-MA-STABLE
___________________________________________________________________
Name: svn:ignore
+ .project


Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-01-31 10:18:31 UTC (rev 3285)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-01-31 10:33:40 UTC (rev 3286)
@@ -46,7 +46,7 @@
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/perfsonar/perfsonar-base/1.0.20080131/perfsonar-base-1.0.20080131.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"/>


Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-01-31 10:18:31 UTC (rev 3285)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-01-31 10:33:40 UTC (rev 3286)
@@ -55,7 +55,7 @@
<artifact:dependencies>

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

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


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

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
2008-01-31 10:18:31 UTC (rev 3285)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
2008-01-31 10:33:40 UTC (rev 3286)
@@ -217,6 +217,10 @@
<antcontrib:then>
<antcall target="exist-simple-setup"/>
</antcontrib:then>
+ <antcontrib:else>
+ <echo>WARNING: You didn't configure xml database.
This service requires to do it !!!</echo>
+ <echo></echo>
+ </antcontrib:else>
</antcontrib:if>
</antcontrib:else>
</antcontrib:if>

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client (from rev
3285, trunk/geant2_java-rrd-ma/contrib/perf-client)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/configuration.txt

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/configuration.txt
(from rev 3285,
trunk/geant2_java-rrd-ma/contrib/perf-client/configuration.txt)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests.pl

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests.pl
(from rev 3285,
trunk/geant2_java-rrd-ma/contrib/perf-client/create_setupdata_requests.pl)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests_refresh.pl

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests_refresh.pl
(from rev 3285,
trunk/geant2_java-rrd-ma/contrib/perf-client/create_setupdata_requests_refresh.pl)

Deleted: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
(from rev 3285, trunk/geant2_java-rrd-ma/contrib/perf-client/perf-client.pl)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests (from
rev 3285, trunk/geant2_java-rrd-ma/contrib/perf-client/requests)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/fully
(from rev 3285, trunk/geant2_java-rrd-ma/contrib/perf-client/requests/fully)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/metadataKeyRequest.xml

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/metadataKeyRequest.xml
(from rev 3285,
trunk/geant2_java-rrd-ma/contrib/perf-client/requests/metadataKeyRequest.xml)

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/refresh (from
rev 3285, trunk/geant2_java-rrd-ma/contrib/perf-client/requests/refresh)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/semi
(from rev 3285, trunk/geant2_java-rrd-ma/contrib/perf-client/requests/semi)

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/single (from
rev 3285, trunk/geant2_java-rrd-ma/contrib/perf-client/requests/single)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/Functional Testing
Specification Document.doc (from rev 3285,
trunk/geant2_java-rrd-ma/doc/Functional Testing Specification Document.doc)

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/schema/SetupDataResponse.rnc
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/doc/schema/SetupDataResponse.rnc
2008-01-31 10:18:31 UTC (rev 3285)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/doc/schema/SetupDataResponse.rnc
2008-01-31 10:33:40 UTC (rev 3286)
@@ -154,7 +154,8 @@
{
Identifier? &
MetadataIdentifierRef &
- (Datum* | ResultCodeDatum)
+ (Datum* | ResultCodeDatum) &
+ Parameters?
}

ResultCodeDatum =

Modified:
branches/GEANT2_JAVA-RRD-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
---
branches/GEANT2_JAVA-RRD-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
2008-01-31 10:18:31 UTC (rev 3285)
+++
branches/GEANT2_JAVA-RRD-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
2008-01-31 10:33:40 UTC (rev 3286)
@@ -164,7 +164,7 @@

}

-
+
/**
* Method to accept requests for action. It implements
* the method definition in ServiceEngine Interface.
@@ -235,6 +235,38 @@
response = storeData(request, true);
}

+ } else if (actionType.equals(ActionType.STORE_KEY)) {
+
+ // handle STORE_KEY
+
+ String storeStatus =
+ configuration.getProperty("service.ma.xmldb.db_store");
+ String dbStatus =
+ configuration.getProperty("component.ma.xmldb.db_status");
+
+ if (!storeStatus.trim().equalsIgnoreCase("on")) {
+
+ response = storeData(request, false);
+
+ logger.debug(
+ "RRDTypeMAServiceEngine.takeAction: "
+ + "writing data into MA is switched off "
+ + "(see 'service.ma.xmldb.db_store' property)");
+
+ } else if (!dbStatus.trim().equalsIgnoreCase("on")) {
+
+ response = storeData(request, false);
+
+ logger.debug(
+ "RRDTypeMAServiceEngine.takeAction: "
+ + "xmldb is not setup in the configuration "
+ + "(see 'component.ma.xmldb.db_status' property)");
+
+ } else {
+
+ response = storeKey(request);
+ }
+
} else if (actionType.equals(ActionType.ECHO)) {

response = getEcho(request);
@@ -886,7 +918,26 @@
}


+ /**
+ * Method used by SQL-MA to store dynamic metadata keys.
+ *
+ * @throws PerfSONARException
+ */
+ protected Message storeKey(Message request)
+ throws PerfSONARException{
+
+ Message response = new Message();

+ PerfSONARException pex =
+ new PerfSONARException(
+ "error.request",
+ "This functionality isn't implemented in RRD-MA yet.");
+
+ ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+ return response;
+ }
+
//---------------------------------- private methods




  • perfsonar: r3286 - in branches/GEANT2_JAVA-RRD-MA-STABLE: . ant contrib contrib/perf-client contrib/perf-client/requests doc doc/schema src/main/java/org/perfsonar/service/measurementArchive/rrdType, svnlog, 01/31/2008

Archive powered by MHonArc 2.6.16.

Top of Page