Chronological Thread 

< Chronological >      < Thread >

---

Author: dante.delvaux
Date: 2013-04-30 19:09:21 +0100 (Tue, 30 Apr 2013)
New Revision: 6296

Added:
trunk/perfsonar-java-base2/src/checkstyle/pmd-ruleset.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/pmd-ruleset.xml
Modified:
trunk/perfsonar-java-base2/

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AttrResponse.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNResponse.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRResponse.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/AbstractRegistrationAction.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/MetadataExistDBRegisterDataSource.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/Metadata.java

trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
trunk/perfsonar-java-rrd-ma-SQL_backend/
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/EchoServiceEngine.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyMessageHandler.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/Rrd.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/ConnectionTester.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/FetchData.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
Log:
pSbase2 and RRD MA: adding PMD configuration file and correcting lots of
minor code style issues.
RRD MA: reverting to jna v 3.4.0 as 3.5.2 seems to change behaviour.


Property changes on: trunk/perfsonar-java-base2
___________________________________________________________________
Modified: svn:ignore
- .settings

build

.classpath

.project

target

.checkstyle

+ .settings

build

.classpath

.project

target

.checkstyle

.pmd

.ruleset


Added: trunk/perfsonar-java-base2/src/checkstyle/pmd-ruleset.xml
===================================================================
--- trunk/perfsonar-java-base2/src/checkstyle/pmd-ruleset.xml
(rev 0)
+++ trunk/perfsonar-java-base2/src/checkstyle/pmd-ruleset.xml 2013-04-30
18:09:21 UTC (rev 6296)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
http://pmd.sourceforge.net/ruleset_2_0_0.xsd";>
+
+ <description>
+ This ruleset checks the perfSONAR source code.
+
+ You should instruct your IDE to use it as a configuration file for PMD.
+ </description>
+
+ <!-- These are the maven-pmd-plugin defaults -->
+ <rule ref="rulesets/basic.xml"/>
+ <rule ref="rulesets/imports.xml"/>
+ <rule ref="rulesets/unusedcode.xml"/>
+
+</ruleset>
\ No newline at end of file


Property changes on: trunk/perfsonar-java-base2/src/checkstyle/pmd-ruleset.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AttrResponse.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AttrResponse.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AttrResponse.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -75,10 +75,8 @@
eventType =
responseMetadata.getChildren("eventType").iterator().next();
}
}
- if (eventType != null) {
- if (eventType.getText().trim().contains("success.as.attr")) {
- res.setStatus(AttrResponse.ATTR_BAD_RESPONSE);
- }
+ if (eventType != null &&
eventType.getText().trim().contains("success.as.attr")) {
+ res.setStatus(AttrResponse.ATTR_BAD_RESPONSE);
}
if (res.getStatus() == AttrResponse.ATTR_OK_RESPONSE) {
Collection<Element> list =
responseMetadata.getChildren("subject",

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNResponse.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNResponse.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNResponse.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -42,10 +42,8 @@
eventType =
responseMetadata.getChildren("eventType").iterator().next();
}
}
- if (eventType != null) {
- if (eventType.getText().trim().contains("success.as.authn")) {
- res.setStatus(AuthNResponse.AUTHENTICATED);
- }
+ if (eventType != null &&
eventType.getText().trim().contains("success.as.authn")) {
+ res.setStatus(AuthNResponse.AUTHENTICATED);
}

return res;

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRResponse.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRResponse.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRResponse.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -18,10 +18,8 @@
eventType =
responseMetadata.getChildren("eventType").iterator().next();
}
}
- if (eventType != null) {
- if (eventType.getText().trim().contains("success.as.authr")) {
- res.setStatus(AuthRResponse.AUTHENTICATED);
- }
+ if (eventType != null &&
eventType.getText().trim().contains("success.as.authr")) {
+ res.setStatus(AuthRResponse.AUTHENTICATED);
}

return res;

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/axis2interface/PerfsonarService.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -2,7 +2,6 @@

import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.ServiceContext;
-import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.perfsonar.base2.service.configuration.ConfigurationManager;
import org.perfsonar.base2.service.requesthandler.axis2.Axis2RequestHandler;

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -277,10 +277,9 @@
*
* mapping.add(oldId, newId);
*/
- if ((meta1.getSubject() != null) &&
(meta1.getSubject().getMetadataIdRef() != null)) {
- if (ids.get(meta1.getSubject().getMetadataIdRef())
!= null) {
+ if (meta1.getSubject() != null &&
meta1.getSubject().getMetadataIdRef() != null
+ &&
ids.get(meta1.getSubject().getMetadataIdRef()) != null) {

meta1.getSubject().setMetadataIdRef(ids.get(meta1.getSubject().getMetadataIdRef()));
- }
}

// put metadata to new common response message
@@ -340,15 +339,12 @@

// metadataIdRef in Subject
// prevent endless loop
- if (metadata.getSubject() != null) {
+ if (metadata.getSubject() != null
+ && (metadata.getSubject().getMetadataIdRef() != null)
+ && !("".equals(metadata.getSubject().getMetadataIdRef()))
+ &&
!(metadata.getId().equals(metadata.getSubject().getMetadataIdRef()))) {

- if ((metadata.getSubject().getMetadataIdRef() != null)
- && !("".equals(metadata.getSubject().getMetadataIdRef()))
- &&
!(metadata.getId().equals(metadata.getSubject().getMetadataIdRef()))) {
-
- getChaining(inputMessage,
metadata.getSubject().getMetadataIdRef(), metadatas);
- }
-
+ getChaining(inputMessage,
metadata.getSubject().getMetadataIdRef(), metadatas);
}

String chainedMetadataId = metadata.getMetadataIdRef();

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/AbstractRegistrationAction.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/AbstractRegistrationAction.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/AbstractRegistrationAction.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -390,10 +390,8 @@
Element responseMetadata = null;
responseMetadata = getResponseMetadata(response);

- if (responseMetadata != null) {
- if (isResponseSuccess(responseMetadata)) {
- return responseMetadata.getFirstChild("key");
- }
+ if (responseMetadata != null && isResponseSuccess(responseMetadata))
{
+ return responseMetadata.getFirstChild("key");
}

return null;

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/MetadataExistDBRegisterDataSource.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/MetadataExistDBRegisterDataSource.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/registration/MetadataExistDBRegisterDataSource.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -72,10 +72,8 @@
protected String getExistComponentName(Configuration configuration)
throws PerfSONARException {

String name =
configuration.getExtensionOption(REGISTER_DATA_SOURCE_EXTENSION_NAME,
"exist-config");
- if (name != null) {
- if (!name.trim().equals("")) {
- return name;
- }
+ if (name != null && !name.trim().equals("")) {
+ return name;
}
return DEFAULT_EXIST_COMPONENT;


Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/Metadata.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/Metadata.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/Metadata.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -45,11 +45,9 @@
}

public EventType getFirstEventType() {
- if (eventTypes != null) {
- if (!eventTypes.isEmpty()) {
- for (EventType e : eventTypes) {
- return e;
- }
+ if (eventTypes != null && !eventTypes.isEmpty()) {
+ for (EventType e : eventTypes) {
+ return e;
}
}
return null;

Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -55,10 +55,8 @@
}

// characters
- if (e.getText() != null) {
- if (!("".equals(e.getText()))) {
- System.out.println(" " + elementName + ".setText(\"" +
e.getText() + "\");");
- }
+ if (e.getText() != null && !("".equals(e.getText()))) {
+ System.out.println(" " + elementName + ".setText(\"" +
e.getText() + "\");");
}

if (parentName != null) {


Property changes on: trunk/perfsonar-java-rrd-ma-SQL_backend
___________________________________________________________________
Modified: svn:ignore
- .settings

.classpath

.project

build

target

logs

+ .settings

.classpath

.project

build

target

logs

.ruleset

.pmd

.checkstyle

reports


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-30 13:29:19
UTC (rev 6295)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-30 18:09:21
UTC (rev 6296)
@@ -179,7 +179,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>3.5.2</version>
+ <version>3.4.0</version>
</dependency>

<dependency>
@@ -219,7 +219,7 @@
<profile>
<id>development</id>
<!-- Activate the development profile and disable the deb
profile with
- mvn -P development -DskipDebProfile -pl perfsonar-java-rrd-ma
+ mvn -P development -DskipDebProfile -pl perfsonar-java-rrd-ma
integration-test
-->
<build>
<resources>
@@ -320,6 +320,15 @@
<prefix>/usr/sbin/</prefix>
</mapper>
</data>
+ <data>
+ <type>template</type>
+ <paths>
+
<path>/var/run/${installName}</path>
+ </paths>
+ <mapper>
+ <type>perm</type>
+ </mapper>
+ </data>
</dataSet>
</configuration>
</execution>

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/pmd-ruleset.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/pmd-ruleset.xml
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/pmd-ruleset.xml
2013-04-30 18:09:21 UTC (rev 6296)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
http://pmd.sourceforge.net/ruleset_2_0_0.xsd";>
+
+ <description>
+ This ruleset checks the perfSONAR source code.
+
+ You should instruct your IDE to use it as a configuration file for PMD.
+ </description>
+
+ <!-- These are the maven-pmd-plugin defaults -->
+ <rule ref="rulesets/basic.xml"/>
+ <rule ref="rulesets/imports.xml"/>
+ <rule ref="rulesets/unusedcode.xml"/>
+
+</ruleset>
\ No newline at end of file


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/pmd-ruleset.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/EchoServiceEngine.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/EchoServiceEngine.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/EchoServiceEngine.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -20,7 +20,6 @@
import
org.perfsonar.service.measurementArchive.rrdType.storage.DataStorageDAOFactory;

import java.util.ArrayList;
-import java.util.Collection;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,9 +44,9 @@
protected String serviceName = "";

protected static final String METADATA_TEST_SUCCESS_RESULT_CODE_RESPONSE
=
- "Fetching data from RRD file is " + "correct.";
+ "Fetching metadata from DB is " + "correct.";
protected static final String
RRD_FETCH_TEST_SUCCESS_RESULT_CODE_RESPONSE =
- "Fetching data from RRD file is " + "correct.";
+ "Fetching data from RRD file is " + "correct.";


// ------------------------------------------------------------- methods

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyMessageHandler.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyMessageHandler.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyMessageHandler.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -72,6 +72,7 @@
}
}
} catch (RuntimeException ex) {
+ LOGGER.warn("Runtime exception ignored: " + ex.getMessage());
}
}

@@ -260,7 +261,7 @@
*/
StringBuilder responseText = new StringBuilder();
String t =
messagePairs.get(0).getRequest().getElement().getAttribute("type");
- String type = (t == null ? "" : t.replaceFirst("Request",
"Response"));
+ String type = t == null ? "" : t.replaceFirst("Request",
"Response");
responseText.append("<nmwg:message type=\"").append(type).append(
"\" xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";
xmlns=\"http://ggf.org/ns/nmwg/base/2.0/\"; "
+
"xmlns:nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";>");
@@ -289,7 +290,7 @@
//Prepare Message Text
StringBuilder responseText = new StringBuilder();
String t =
messagePairs.get(0).getRequest().getElement().getAttribute("type");
- String type = (t == null ? "" : t.replaceFirst("Request",
"Response"));
+ String type = t == null ? "" : t.replaceFirst("Request",
"Response");
responseText.append("<nmwg:message type=\"").append(type).append(
"\" xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";
xmlns=\"http://ggf.org/ns/nmwg/base/2.0/\"; "
+
"xmlns:nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";>");
@@ -366,10 +367,9 @@
* mapping.add(oldId, newId);
*
*/
- if ((meta1.getSubject() != null) &&
(meta1.getSubject().getMetadataIdRef() != null)) {
- if (ids.get(meta1.getSubject().getMetadataIdRef())
!= null) {
-
meta1.getSubject().setMetadataIdRef(ids.get(meta1.getSubject().getMetadataIdRef()));
- }
+ if (meta1.getSubject() != null &&
meta1.getSubject().getMetadataIdRef() != null
+ &&
ids.get(meta1.getSubject().getMetadataIdRef()) != null) {
+
meta1.getSubject().setMetadataIdRef(ids.get(meta1.getSubject().getMetadataIdRef()));
}

//put metadata to new common response message
@@ -428,7 +428,7 @@
//metadataIdRef in Subject
//prevent endless loop
if (metadata.getSubject() != null
- && (metadata.getSubject().getMetadataIdRef() != null)
+ && metadata.getSubject().getMetadataIdRef() != null
&& !(metadata.getSubject().getMetadataIdRef() != null &&
metadata.getSubject().getMetadataIdRef().isEmpty())
&&
!(metadata.getId().equals(metadata.getSubject().getMetadataIdRef()))) {
getChaining(inputMessage,
metadata.getSubject().getMetadataIdRef(), metadatas);
@@ -437,7 +437,7 @@
String chainedMetadataId = metadata.getMetadataIdRef();

//get other chain, prevent endless loop
- if ((chainedMetadataId != null)
+ if (chainedMetadataId != null
&& !(chainedMetadataId != null && chainedMetadataId.isEmpty())
&& !(metadata.getId().equals(chainedMetadataId))) {
getChaining(inputMessage, chainedMetadataId, metadatas);

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -37,7 +37,7 @@
throw new PerfSONARException("query_exception", "no data
trigger");
}

- Map metadataMap = request.getMetadataMap();
+ Map<String, Metadata> metadataMap = request.getMetadataMap();
Metadata metadata = (Metadata)
metadataMap.get(data.getMetadataIdRef());

try {
@@ -61,7 +61,7 @@
}


- protected void getKey(Metadata metadata, Map metadataMap, ServiceMessage
serviceResponse,
+ protected void getKey(Metadata metadata, Map<String, Metadata>
metadataMap, ServiceMessage serviceResponse,
MetadataStorageDAO dao) throws PerfSONARException
{


Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -76,7 +76,7 @@
Key key = data.getKey();

Metadata metadata = null;
- Map metadataMap = keyMessage.getMetadataMap();
+ Map<String, Metadata> metadataMap = keyMessage.getMetadataMap();
if (!metadataMap.isEmpty()) {
if (data.getMetadataIdRef() != null) {
metadata = (Metadata)
metadataMap.get(data.getMetadataIdRef());
@@ -230,7 +230,7 @@
}


- Map metadataMap = request.getMetadataMap();
+ Map<String, Metadata> metadataMap = request.getMetadataMap();
Metadata metadata = (Metadata)
metadataMap.get(data.getMetadataIdRef());

//try {
@@ -255,7 +255,7 @@
}


- protected void getKey(Metadata metadata, Data data, Map metadataMap,
Message message,
+ protected void getKey(Metadata metadata, Data data, Map<String,
Metadata> metadataMap, Message message,
MetadataStorageDAO dao) throws PerfSONARException
{


Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -21,20 +21,13 @@

protected Logger logger = LoggerFactory.getLogger(getClass());

- // -------------------------------------------------------------
-
public static final String CONSOLIDATION_AVERAGE = "AVERAGE";
-
public static final String CONSOLIDATION_MIN = "MIN";
-
public static final String CONSOLIDATION_MAX = "MAX";
-
public static final String CONSOLIDATION_LAST = "LAST";

/**
* Default value for the consolidation.
- *
- * @see Consolidation
*/
public static final String DEFAULT_CONSOLIDATION = CONSOLIDATION_AVERAGE;

@@ -54,46 +47,28 @@
*/
public static final long DEFAULT_END = -1;

- // -------------------------------------------------------------
constructor
-
-
- public RRDDataStorageDAOImpl() throws PerfSONARException
- {
+ public RRDDataStorageDAOImpl() throws PerfSONARException {
super();
}

-
- // ------------------------------------------------------------- methods
-
-
- public void run() throws PerfSONARException
- {
+ public void run() throws PerfSONARException {
}

- public void init() throws PerfSONARException
- {
+ public void init() throws PerfSONARException {
}

-
- public void destroy() throws PerfSONARException
- {
+ public void destroy() throws PerfSONARException {
}

-
- public Data fetch(Element request) throws PerfSONARException
- {
+ public Data fetch(Element request) throws PerfSONARException {
return rrdFetch((Message) request);
}

-
- public void store(Element request) throws PerfSONARException
- {
+ public void store(Element request) throws PerfSONARException {
throw new PerfSONARException("storing_not_supported", "Can not store
data.");
}

-
- protected Data rrdFetch(Message request) throws PerfSONARException
- {
+ protected Data rrdFetch(Message request) throws PerfSONARException {
Data rrdData = null;

Metadata metadata =
request.getMetadataCollection().iterator().next();
@@ -111,31 +86,39 @@

Parameters selectParameters =
key.getParameters("http://ggf.org/ns/nmwg/ops/select/2.0/";);

- Parameter startTimeParameter = null;
- Parameter endTimeParameter = null;
- String startTimeValue = null;
- String endTimeValue = null;
-
+ long startTime = DEFAULT_START;
+ long endTime = DEFAULT_END;
+ String consolidationFunction = DEFAULT_CONSOLIDATION;
+ int resolution = DEFAULT_RESOLUTION;
try {
- startTimeParameter =
selectParameters.getFirstParameter("startTime");
+ Parameter startTimeParameter =
selectParameters.getFirstParameter("startTime");
+ startTime =
Long.parseLong(TimeDateUtil.getUnixTime(startTimeParameter));
} catch (Exception ex) {
+ logger.debug("No or not parsable startTime parameter.");
}
try {
- endTimeParameter = selectParameters.getFirstParameter("endTime");
+ Parameter endTimeParameter =
selectParameters.getFirstParameter("endTime");
+ endTime =
Long.parseLong(TimeDateUtil.getUnixTime(endTimeParameter));
} catch (Exception ex) {
+ logger.debug("No or not parsable endTime parameter.");
}
- startTimeValue = TimeDateUtil.getUnixTime(startTimeParameter);
- endTimeValue = TimeDateUtil.getUnixTime(endTimeParameter);
- String consolidationFunctionValue = null;
- String resolutionValue = null;
-
try {
- consolidationFunctionValue =
selectParameters.getFirstParameterValue("consolidationFunction");
+ String consolidationFunctionValue =
selectParameters.getFirstParameterValue("consolidationFunction");
+ if (consolidationFunctionValue.equals(CONSOLIDATION_AVERAGE)
+ || consolidationFunctionValue.equals(CONSOLIDATION_MIN)
+ || consolidationFunctionValue.equals(CONSOLIDATION_MAX)
+ || consolidationFunctionValue.equals(CONSOLIDATION_LAST))
+ {
+ consolidationFunction = consolidationFunctionValue;
+ }
} catch (Exception ex) {
+ logger.debug("No or unkown consolidationFunction parameter.");
}
try {
- resolutionValue =
selectParameters.getFirstParameterValue("resolution");
+ String resolutionValue =
selectParameters.getFirstParameterValue("resolution");
+ resolution = Integer.parseInt(resolutionValue);
} catch (Exception ex) {
+ logger.debug("No or not parsable resolution parameter.");
}

// -------------- nmwg parameter elements
@@ -155,18 +138,22 @@
try {
file = nmwgParameters.getFirstParameterValue("file");
} catch (Exception ex) {
+ logger.debug("No file parameter.");
}
try {
dataSource = nmwgParameters.getFirstParameterValue("dataSource");
} catch (Exception ex) {
+ logger.debug("No dataSource parameter.");
}
try {
valueUnits = nmwgParameters.getFirstParameterValue("valueUnits");
} catch (Exception ex) {
+ logger.debug("No valueUnits parameter.");
}
try {
eventType = nmwgParameters.getFirstParameterValue("eventType");
} catch (Exception ex) {
+ logger.debug("No eventType parameter.");
}
if (eventType.trim().isEmpty()) {
eventType = null;
@@ -175,89 +162,55 @@
try {
dataSourceStep =
nmwgParameters.getFirstParameterValue("dataSourceStep");
} catch (Exception ex) {
+ logger.debug("No dataSourceStep parameter.");
}
try {
dataSourceType =
nmwgParameters.getFirstParameterValue("dataSourceType");
} catch (Exception ex) {
+ logger.debug("No dataSourceType parameter.");
}
try {
dataSourceHeartbeat =
nmwgParameters.getFirstParameterValue("dataSourceHeartbeat");
} catch (Exception ex) {
+ logger.debug("No dataSourceHeartbeat parameter.");
}
try {
dataSourceMinValue =
nmwgParameters.getFirstParameterValue("dataSourceMinValue");
} catch (Exception ex) {
+ logger.debug("No dataSourceMinValue parameter.");
}
try {
dataSourceMaxValue =
nmwgParameters.getFirstParameterValue("dataSourceMaxValue");
} catch (Exception ex) {
+ logger.debug("No dataSourceMaxValue parameter.");
}

- long startTime = DEFAULT_START;
- long endTime = DEFAULT_END;
- String consolidationFunction = DEFAULT_CONSOLIDATION;
- int resolution = DEFAULT_RESOLUTION;
-
try {
- startTime = Long.parseLong(startTimeValue);
- } catch (Exception ex) {
- }
- try {
- endTime = Long.parseLong(endTimeValue);
- } catch (Exception ex) {
- }
- try {
- resolution = Integer.parseInt(resolutionValue);
- } catch (Exception ex) {
- }
-
- try {
- if (consolidationFunctionValue.equals(CONSOLIDATION_AVERAGE)
- || consolidationFunctionValue.equals(CONSOLIDATION_MIN)
- || consolidationFunctionValue.equals(CONSOLIDATION_MAX)
- || consolidationFunctionValue.equals(CONSOLIDATION_LAST))
- {
- consolidationFunction = consolidationFunctionValue;
- }
-
- } catch (Exception ex) {
- }
-
- try {
+ logger.debug("Now trying to get data out of RRD file.");
FetchData fdata = Rrd.fetch(file, consolidationFunction,
startTime, endTime, resolution);

rrdData = getRRDColumn(fdata, dataSource, valueUnits, eventType);

Parameters parameters = new Parameters();

- if (dataSourceStep != null) {
- if (!dataSourceStep.trim().isEmpty()) {
-
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceStep"));
- }
+ if (dataSourceStep != null && !dataSourceStep.trim().isEmpty()) {
+
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceStep"));
}

- if (dataSourceType != null) {
- if (!dataSourceType.trim().isEmpty()) {
-
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceType"));
- }
+ if (dataSourceType != null && !dataSourceType.trim().isEmpty()) {
+
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceType"));
}

- if (dataSourceHeartbeat != null) {
- if (!dataSourceHeartbeat.trim().isEmpty()) {
-
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceHeartbeat"));
- }
+ if (dataSourceHeartbeat != null &&
!dataSourceHeartbeat.trim().isEmpty()) {
+
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceHeartbeat"));
}

- if (dataSourceMinValue != null) {
- if (!dataSourceMinValue.trim().isEmpty()) {
-
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceMinValue"));
- }
+ if (dataSourceMinValue != null &&
!dataSourceMinValue.trim().isEmpty()) {
+
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceMinValue"));
}

- if (dataSourceMaxValue != null) {
- if (!dataSourceMaxValue.trim().isEmpty()) {
-
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceMaxValue"));
- }
+ if (dataSourceMaxValue != null &&
!dataSourceMaxValue.trim().isEmpty()) {
+
parameters.addChild(nmwgParameters.getFirstParameter("dataSourceMaxValue"));
}

rrdData.addChild(parameters);
@@ -272,10 +225,18 @@
return rrdData;
}

+ /**
+ * Builds a NMWG response containing the RRD retrieved data
+ * @param fetchData
+ * @param dataSource
+ * @param valueUnits
+ * @param eventType
+ * @return
+ * @throws PerfSONARException
+ */
private Data getRRDColumn(FetchData fetchData, String dataSource, String
valueUnits,
- String eventType) throws PerfSONARException
- {
-
+ String eventType) throws PerfSONARException {
+ logger.debug("Building NMWG response with the RRD retreived data.");
int rows = fetchData.getRowCount();
int cols = fetchData.getColCount();

@@ -287,11 +248,7 @@
}
}

- //DEBUG
- //System.out.println("DataSource: "+dataSource+" is column: "+ds);
-
if (ds > -1) {
-
ResponseGenerator responseGenerator = null;
Data data = null;

@@ -303,21 +260,14 @@
data = responseGenerator.getResponse(fetchData, ds, rows,
valueUnits);

return data;
-
- //return (new Data());
-
} else {
-
throw new PerfSONARException("rrd_file_exception", "No " +
dataSource + " column/data source in RRD file");
-
}
-
}


protected ResponseGenerator getResponseGenerator(String eventType)
throws PerfSONARException
{
-
String responseGeneratorClassName = getOption("eventType::" +
eventType).getValue();

ResponseGenerator responseGenerator = null;
@@ -330,8 +280,6 @@
}

return responseGenerator;
-
}

-
} //RRDDataStorageDAOImpl

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/Rrd.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/Rrd.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/Rrd.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -21,14 +21,12 @@
}

public static FetchData fetch(String filename, String
consolidationFunction, long start, long end,
- int resolution) throws RrdException
- {
+ int resolution) throws RrdException {
return fetch(FETCH, filename, consolidationFunction, START,
String.valueOf(start), END, String.valueOf(end),
RESOLUTION, String.valueOf(resolution));
}

- public static synchronized FetchData fetch(String... args) throws
RrdException
- {
+ public static synchronized FetchData fetch(String... args) throws
RrdException {
RrdLibrary rrd = RrdLibrary.INSTANCE;

RrdLibrary.time_t start = new RrdLibrary.time_t();

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -1,7 +1,5 @@
package org.perfsonar.service.measurementArchive.rrdType.storage.rrd;

-import java.util.List;
-
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.NativeLibrary;
@@ -38,16 +36,6 @@
public time_t(int value) {
this.value = value;
}
-
- /* (non-Javadoc)
- * @see com.sun.jna.Structure#getFieldOrder()
- */
- @Override
- protected List getFieldOrder() {
- // TODO Auto-generated method stub
- return null;
- }
}
-
// CHECKSTYLE_ON: ALL
}

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -62,68 +62,70 @@
public Map<String, String> getParametersMap(Metadata metadata, String
tableName) throws PerfSONARException {
Map<String, String> resultMap = new HashMap<String, String>();

- String keyword = null;
-
- String ifAddress = null;
- String hostName = null;
- String ifName = null;
- String ifDescription = null;
- String ifAddressType = null;
- String direction = null;
- String classOfService = null;
- String capacity = null;
- // Currently unused
- String ifIndex = null;
- String type = null;
-
// We first dispatch on the eventType in case we need to answer a
selftest request
String eventType = getEventType(metadata.getFirstEventType());
if
(eventType.contains("http://schemas.perfsonar.net/tools/admin/selftest/1.0/metadata-test";))
{
// A metadata test consist of reading any metadata information
inside the metadata DB
- logger.debug("dipatch to metadata-test");
+ logger.debug("dispatch to metadata-test");
resultMap.put("query", "SELECT * FROM " + tableName + " LIMIT
1;");
return resultMap;

} else if
(eventType.contains("http://schemas.perfsonar.net/tools/admin/selftest/1.0/rrd-fetch-test";))
{
// An rrd-fetch test consist of reading any RRD file available
- logger.debug("dipatch to rrd-fetch-test");
+ logger.debug("dispatch to rrd-fetch-test");
resultMap.put("query", "SELECT * FROM " + tableName + " LIMIT
1;");
return resultMap;
}

logger.debug("Mapping query parameters.");
+ resultMap.put("eventType", eventType);
if (metadata.getSubject() != null) {
- Element interf =
metadata.getSubject().getFirstChild("interface");
+ Element iface = metadata.getSubject().getFirstChild("interface");

- if (interf != null) {
- ifAddress = (interf.getFirstChild("ifAddress") != null ?
interf.getFirstChild(
- "ifAddress").getText().trim() : null);
- hostName = (interf.getFirstChild("hostName") != null
- ?
interf.getFirstChild("hostName").getText().trim()
- : null);
- ifName = (interf.getFirstChild("ifName") != null
- ? interf.getFirstChild("ifName").getText().trim()
- : null);
- ifDescription = (interf.getFirstChild("ifDescription") !=
null ? interf.getFirstChild(
- "ifDescription").getText().trim() : null);
- ifIndex = (interf.getFirstChild("ifIndex") != null
- ? interf.getFirstChild("ifIndex").getText().trim()
- : null);
- type = (interf.getFirstChild("type") != null ?
interf.getFirstChild("type").getText().trim() : null);
- direction = (interf.getFirstChild("direction") != null ?
interf.getFirstChild(
- "direction").getText().trim() : null);
- classOfService = (interf.getFirstChild("classOfService") !=
null ? interf.getFirstChild(
- "classOfService").getText().trim() : null);
- capacity = (interf.getFirstChild("capacity") != null
- ?
interf.getFirstChild("capacity").getText().trim()
- : null);
- try {
- ifAddressType =
(!interf.getFirstChild("ifAddress").getAttribute("type").trim().isEmpty()
- ?
interf.getFirstChild("ifAddress").getAttribute("type").trim()
- : null);
- } catch (Exception ex) {
- ifAddressType = null;
+ if (iface != null) {
+ if (iface.getFirstChild("ifAddress") != null) {
+ if
(!iface.getFirstChild("ifAddress").getText().trim().isEmpty()) {
+ resultMap.put("ifAddress",
iface.getFirstChild("ifAddress").getText().trim());
+ }
+ if
(iface.getFirstChild("ifAddress").getAttribute("type") != null
+ &&
!iface.getFirstChild("ifAddress").getAttribute("type").trim().isEmpty()) {
+ resultMap.put("ifAddressType",
iface.getFirstChild("ifAddress").getAttribute("type").trim());
+ }
}
+ if (iface.getFirstChild("hostName") != null
+ &&
!iface.getFirstChild("hostName").getText().trim().isEmpty()) {
+ resultMap.put("hostName",
iface.getFirstChild("hostName").getText().trim());
+ }
+ if (iface.getFirstChild("ifName") != null
+ &&
!iface.getFirstChild("ifName").getText().trim().isEmpty()) {
+ resultMap.put("ifName",
iface.getFirstChild("ifName").getText().trim());
+ }
+ if (iface.getFirstChild("ifDescription") != null
+ &&
!iface.getFirstChild("ifDescription").getText().trim().isEmpty()) {
+ resultMap.put("ifDescription",
iface.getFirstChild("ifDescription").getText().trim());
+ }
+ /* ifIndex and type are currently unused and not declared in
the DB
+ if (iface.getFirstChild("ifIndex") != null
+ &&
!iface.getFirstChild("ifIndex").getText().trim().isEmpty()) {
+ resultMap.put("ifIndex",
iface.getFirstChild("ifIndex").getText().trim());
+ }
+ if (iface.getFirstChild("type") != null
+ &&
!iface.getFirstChild("type").getText().trim().isEmpty()) {
+ resultMap.put("type",
iface.getFirstChild("type").getText().trim());
+ }
+ */
+ if (iface.getFirstChild("direction") != null
+ &&
!iface.getFirstChild("direction").getText().trim().isEmpty()) {
+ resultMap.put("direction",
iface.getFirstChild("direction").getText().trim());
+ }
+ if (iface.getFirstChild("classOfService") != null
+ &&
!iface.getFirstChild("classOfService").getText().trim().isEmpty()) {
+ resultMap.put("classOfService",
iface.getFirstChild("classOfService").getText().trim());
+ }
+ if (iface.getFirstChild("capacity") != null
+ &&
!iface.getFirstChild("capacity").getText().trim().isEmpty()) {
+ resultMap.put("capacity",
iface.getFirstChild("capacity").getText().trim());
+ }
} else {
String msg = "Missing interface element in metadata
element.";
logger.warn("Query cannot be performed: {}", msg);
@@ -135,31 +137,9 @@
throw new PerfSONARException("query_exception", msg);
}

- keyword = getKeyword(metadata.getParameters());
- resultMap.put("eventType", eventType);
-
- if (ifAddress != null
- || hostName != null
- || ifName != null
- || ifDescription != null
- || ifAddress != null
- || ifAddressType != null
- || direction != null
- || classOfService != null
- || capacity != null
- || keyword != null) {
-
- resultMap.put("hostName", hostName);
- resultMap.put("ifAddress", ifAddress);
- resultMap.put("ifAddressType", ifAddressType);
- resultMap.put("ifName", ifName);
- resultMap.put("ifDescription", ifDescription);
- //resultMap.put("ifIndex", ifIndex);
- //resultMap.put("type", type);
- resultMap.put("direction", direction);
- resultMap.put("capacity", capacity);
+ String keyword = getKeyword(metadata.getParameters());
+ if (keyword != null) {
resultMap.put("keyword", keyword);
- resultMap = querySelectWithCriteria(resultMap);
}

return buildQuery(resultMap, tableName);
@@ -192,86 +172,6 @@
}


- protected Map<String, String> querySelectWithCriteria(Map<String,
String> parametersMap) throws PerfSONARException {
-
- if (parametersMap.get("ifAddress") != null) {
- if (parametersMap.get("ifAddress").isEmpty()) {
- throw new PerfSONARException("query_exception", " wrong
ifAddress");
- }
- } else {
- parametersMap.remove("ifAddress");
- }
-
- if (parametersMap.get("hostName") != null) {
- if (parametersMap.get("hostName").isEmpty()) {
- throw new PerfSONARException("query_exception", "wrong
hostName");
- }
- } else {
- parametersMap.remove("hostName");
- }
-
- if (parametersMap.get("ifName") != null) {
- if (parametersMap.get("ifName").isEmpty()) {
- throw new PerfSONARException("query_exception", "wrong
ifName");
- }
- } else {
- parametersMap.remove("ifName");
- }
-
- if (parametersMap.get("ifDescription") != null) {
- if (parametersMap.get("ifDescription").isEmpty()) {
- throw new PerfSONARException("query_exception", "wrong
ifDescription");
- }
- } else {
- parametersMap.remove("ifDescription");
- }
-
-
- /*
- if (parametersMap.get("ifIndex") != null) {
- if (parametersMap.get("ifIndex").equals(""))
- throw new PerfSONARException("query_exception", "wrong
ifIndex");
- }else{
- parametersMap.remove("ifIndex");
- }
- */
-
- /*
- if (parametersMap.get("type") != null) {
- if (parametersMap.get("type").equals(""))
- throw new PerfSONARException("query_exception", "wrong
type");
- }else{
- parametersMap.remove("type");
- }*/
-
- if (parametersMap.get("direction") != null) {
- if (parametersMap.get("direction").isEmpty()) {
- throw new PerfSONARException("query_exception", "wrong
direction");
- }
- } else {
- parametersMap.remove("direction");
- }
-
- if (parametersMap.get("capacity") != null) {
- if (parametersMap.get("capacity").isEmpty()) {
- throw new PerfSONARException("query_exception", "wrong
capacity");
- }
- } else {
- parametersMap.remove("capacity");
- }
-
- if (parametersMap.get("ifAddressType") == null) {
- parametersMap.remove("ifAddressType");
- }
-
- if (parametersMap.get("keyword") == null) {
- parametersMap.remove("keyword");
- }
-
- return parametersMap;
- }
-
-
/**
* Returns the value of <parameter name="keyword"> tag.
*
@@ -279,12 +179,10 @@
* @return keyword value string
*/
protected String getKeyword(Parameters parameters) {
- if (parameters != null) {
- if (parameters.getFirstParameter("keyword") != null) {
- String keyword =
parameters.getFirstParameter("keyword").getText();
- logger.debug("Keyword is: {}", keyword);
- return (keyword);
- }
+ if (parameters != null && parameters.getFirstParameter("keyword") !=
null) {
+ String keyword =
parameters.getFirstParameter("keyword").getText();
+ logger.debug("Keyword is: {}", keyword);
+ return (keyword);
}

return null;

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/ConnectionTester.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/ConnectionTester.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/ConnectionTester.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -6,6 +6,9 @@
import java.sql.SQLException;
import java.sql.Statement;

+/**
+ * TODO: to be removed and replaced by integration tests
+ */
public class ConnectionTester
{
private Connection conn;

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/FetchData.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/FetchData.java
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/temp/FetchData.java
2013-04-30 18:09:21 UTC (rev 6296)
@@ -7,6 +7,9 @@
import java.util.ArrayList;
import java.util.List;

+/**
+ * TODO: to be removed and replaced by unit tests
+ */
public class FetchData
{
private final ConnectionTester ct = new ConnectionTester();
@@ -74,12 +77,10 @@
}
*/

- String s = sb.toString();
sb.append("</nmwg:message>");
metadataContent = sb.toString();
conn.close();
} catch (SQLException e) {
-
System.err.println(e.toString());
}


Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
2013-04-30 18:09:21 UTC (rev 6296)
@@ -25,4 +25,4 @@
<property name="javax.persistence.transaction"
value="RESOURCE_LOCAL"/>
</properties>
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
2013-04-30 18:09:21 UTC (rev 6296)
@@ -44,12 +44,12 @@

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
<option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
- <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
- <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
</component>

<component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
- <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

</component>

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">
@@ -69,8 +69,8 @@
<!-- LS registration from base2 relies on metadata being
present in eXist DB, but we don't have it anymore since v3.4 -->
<option name="status" value="off"/>
<option name="interval" value="3500"/> <!-- sec -->
- <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

- <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
<option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
<option name="lsAddress-1"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
<!--
@@ -85,8 +85,8 @@

<!-- auth configuration -->
<component
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
name="auth">
- <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
- <option name="comp_id" value="urn:compId"/>
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
</component>

</auxiliaryComponents>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template
2013-04-30 18:09:21 UTC (rev 6296)
@@ -77,8 +77,8 @@

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
<option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
- <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
- <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
</component>


@@ -94,8 +94,8 @@

<option name="status" value="on"/>
<option name="interval" value="3500"/> <!-- sec -->
- <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

- <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
<option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
<option name="lsAddress-1" value="${service.r.ls_url}"/>
<!--
@@ -104,7 +104,6 @@
<option name ="lsAddress-4"></option>
<option name ="lsAddress-5"></option>
-->
-
</action>

</actions>
@@ -113,8 +112,8 @@

<!-- auth configuration -->
<component
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
name="auth">
- <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
- <option name="comp_id" value="urn:compId"/>
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
</component>

</auxiliaryComponents>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-04-30 18:09:21 UTC (rev 6296)
@@ -1,176 +1,286 @@
<?xml version="1.0" encoding="UTF-8"?>
<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>
-
- <!-- service information consists of name, version (only for
displaying purpose) and accessPoint -->
- <wa:serviceInformation>
-
<wa:accessPoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
- <wa:serviceName>${name}</wa:serviceName>
- <wa:version>${version}</wa:version>
- </wa:serviceInformation>
-
- <!-- credential for WA -->
- <wa:credential>
- <wa:username>perfsonaruser</wa:username>
- <wa:password>perfsonarpass</wa:password>
- </wa:credential>
-
- <wa:basiclink>
- <wa:pageId>basic</wa:pageId> <!-- page identifier -->
- <wa:title>Service Settings</wa:title>
- </wa:basiclink>
-
- <wa:basiclink>
- <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
- <wa:title>WebAdmin Settings</wa:title>
- </wa:basiclink>

+ <!-- service information consists of name, version (only for displaying
purpose) and accessPoint -->
+ <wa:serviceInformation>
+
<wa:accessPoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
+ <wa:serviceName>${name}</wa:serviceName>
+ <wa:version>${version}</wa:version>
+ </wa:serviceInformation>
+
+ <!-- credential for WA -->
+ <wa:credential>
+ <wa:username>perfsonaruser</wa:username>
+ <wa:password>perfsonarpass</wa:password>
+ </wa:credential>
+
<wa:basiclink>
+ <wa:pageId>basic</wa:pageId> <!-- page identifier -->
+ <wa:title>Service Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
+ <wa:title>WebAdmin Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
<wa:servletId>initDb</wa:servletId>
<wa:title>Empty Database</wa:title>
</wa:basiclink>

- <wa:advancedlink>
- <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
- <wa:title>Advanced Service Settings</wa:title>
- </wa:advancedlink>
-
- <wa:map>
-
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
- <wa:ns>ns1</wa:ns>
- </wa:map>
-
- <wa:map>
-
<wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
- <wa:ns>webAdmin</wa:ns>
- </wa:map>
-
- <wa:page>
- <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
- <wa:title><wa:text>Change Password</wa:text></wa:title>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Username</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
- <wa:plain><wa:password>
- <wa:title><wa:text>Password</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
- </wa:xpath></wa:default>
- </wa:password></wa:plain>
- </wa:page>
+ <wa:advancedlink>
+ <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
+ <wa:title>Advanced Service Settings</wa:title>
+ </wa:advancedlink>

- <wa:page>
- <wa:pageId><wa:text>basic</wa:text></wa:pageId>
- <wa:title><wa:text>Basic configuration</wa:text></wa:title>
+ <wa:map>
+ <wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
+ <wa:ns>ns1</wa:ns>
+ </wa:map>

+ <wa:map>
+ <wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
+ <wa:ns>webAdmin</wa:ns>
+ </wa:map>
+
+ <wa:page>
+ <wa:pageId>
+ <wa:text>changePassword</wa:text>
+ </wa:pageId>
+ <wa:title>
+ <wa:text>Change Password</wa:text>
+ </wa:title>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Username</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:password>
+ <wa:title>
+ <wa:text>Password</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
+ </wa:xpath>
+ </wa:default>
+ </wa:password>
+ </wa:plain>
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId>
+ <wa:text>basic</wa:text>
+ </wa:pageId>
+ <wa:title>
+ <wa:text>Basic configuration</wa:text>
+ </wa:title>
+
<!-- General service configuration -->
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Access point</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Service name</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Service type</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Access point</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Service name</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Service type</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>

<!-- MySQL configuration -->
- <wa:plain><wa:textbox>
- <wa:title><wa:text>MySQL server address</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="uri"]/@value
- </wa:xpath></wa:default>
- </wa:textbox>
- </wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>MySQL username</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="username"]/@value
- </wa:xpath></wa:default>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>MySQL server address</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="uri"]/@value
+ </wa:xpath>
+ </wa:default>
</wa:textbox>
</wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>MySQL password</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="password"]/@value
- </wa:xpath></wa:default>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>MySQL username</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="username"]/@value
+ </wa:xpath>
+ </wa:default>
</wa:textbox>
</wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>MySQL schema name</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="schema"]/@value
- </wa:xpath></wa:default>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>MySQL password</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="password"]/@value
+ </wa:xpath>
+ </wa:default>
</wa:textbox>
</wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>MySQL schema name</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="schema"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>

- <!--LS configuration -->
- <wa:plain><wa:radio>
- <wa:title><wa:text>Lookup Service registration:
</wa:text></wa:title>
- <wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
- </wa:default>
- <wa:values><wa:text>on,off</wa:text></wa:values>
- </wa:radio></wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Lookup Service URL</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Lookup Service registration interval
(seconds)</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
- </wa:page>
+ <!--LS configuration -->
+ <wa:plain>
+ <wa:radio>
+ <wa:title>
+ <wa:text>Lookup Service registration: </wa:text>
+ </wa:title>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
+ </wa:default>
+ <wa:values>
+ <wa:text>on,off</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Lookup Service URL</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Lookup Service registration interval
(seconds)</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>
+ </wa:page>

- <wa:page>
- <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
- <wa:title><wa:text>Advanced configuration</wa:text></wa:title>
+ <wa:page>
+ <wa:pageId>
+ <wa:text>advanced</wa:text>
+ </wa:pageId>
+ <wa:title>
+ <wa:text>Advanced configuration</wa:text>
+ </wa:title>

- <!-- auth configuration -->
- <wa:plain><wa:textbox>
- <wa:title><wa:text>Authorization endpoint
URL</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
- </wa:xpath></wa:default>
- </wa:textbox></wa:plain>
-<!-- authorization of requests -->
- <wa:plain><wa:radio>
- <wa:title><wa:text>Echo Request
authorization</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
- </wa:xpath></wa:default>
- <wa:values><wa:text>no,yes</wa:text></wa:values>
- </wa:radio></wa:plain>
+ <!-- auth configuration -->
+ <wa:plain>
+ <wa:textbox>
+ <wa:title>
+ <wa:text>Authorization endpoint URL</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
+ </wa:xpath>
+ </wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <!-- authorization of requests -->
+ <wa:plain>
+ <wa:radio>
+ <wa:title>
+ <wa:text>Echo Request authorization</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:values>
+ <wa:text>no,yes</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>

- <wa:plain><wa:radio>
- <wa:title><wa:text>Metadata Key Request
authorization</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
- </wa:xpath></wa:default>
- <wa:values><wa:text>no,yes</wa:text></wa:values>
- </wa:radio></wa:plain>
+ <wa:plain>
+ <wa:radio>
+ <wa:title>
+ <wa:text>Metadata Key Request authorization</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:values>
+ <wa:text>no,yes</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>

- <wa:plain><wa:radio>
- <wa:title><wa:text>Setup Data Request
authorization</wa:text></wa:title>
- <wa:default><wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
- </wa:xpath></wa:default>
- <wa:values><wa:text>no,yes</wa:text></wa:values>
- </wa:radio></wa:plain>
- </wa:page>
+ <wa:plain>
+ <wa:radio>
+ <wa:title>
+ <wa:text>Setup Data Request authorization</wa:text>
+ </wa:title>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:values>
+ <wa:text>no,yes</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+ </wa:page>
</wa:WebAdminInterface>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
2013-04-30 18:09:21 UTC (rev 6296)
@@ -25,4 +25,4 @@
<property name="javax.persistence.transaction"
value="RESOURCE_LOCAL"/>
</properties>
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
2013-04-30 13:29:19 UTC (rev 6295)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
2013-04-30 18:09:21 UTC (rev 6296)
@@ -44,16 +44,16 @@

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
<option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
- <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
- <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
</component>

<component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
- <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

</component>

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">
- <option name="uri" value="jdbc:mysql://rrdma:3306/"/>
+ <option name="uri" value="jdbc:mysql://rrdma-new:3306/"/>
<option name="schema" value ="perfsonar_rrdma"/>
<option name="username" value="perfsonar_rrdma"/>
<option name="password" value="testpass"/>
@@ -69,8 +69,8 @@
<!-- LS registration from base2 relies on metadata being
present in eXist DB, but we don't have it anymore since v3.4 -->
<option name="status" value="off"/>
<option name="interval" value="3500"/> <!-- sec -->
- <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

- <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
<option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
<option name="lsAddress-1"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
<!--
@@ -85,8 +85,8 @@

<!-- auth configuration -->
<component
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
name="auth">
- <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
- <option name="comp_id" value="urn:compId"/>
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
</component>

</auxiliaryComponents>

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6296 - in trunk: perfsonar-java-base2 perfsonar-java-base2/src/ checkstyle perfsonar-java-base2/src/main/java/org/perfsona r/base2/service/authn perfsonar-java-base2/src/main/java/o rg/perfsonar/base2/service/axis2interface perfsonar-java-b ase2/src/main/java/org/perfsonar/base2/service/messages pe rfsonar-java-base2/src/main/java/org/perfsonar/base2/servi ce/registration perfsonar-java-base2/src/main/java/org/per fsonar/base2/xml/nmwg perfsonar-java-base2/src/main/java/o rg/perfsonar/test perfsonar-java-rrd-ma-SQL_backend perf sonar-java-rrd-ma-SQL_backend/src/checkstyle perfsonar-j ava-rrd-ma-SQL_backend/src/main/java/org/perfsonar/servi ce/measurementArchive/rrdType perfsonar-java-rrd-ma-SQL_ backend/src/main/java/org/perfsonar/service/measurementArc hive/rrdType/storage/rrd perfsonar-java-rrd-ma-SQL_backe nd/src/main/java/org/perfsonar/service/measurementArchive/ rrdType/storage/sql/query perfsonar-java-rrd-ma-SQL_back end/src/main/java/org/perfsona r/service/temp perfsonar-ja va-rrd-ma-SQL_backend/src/main/resources/META-INF perfso nar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar /conf perfsonar-java-rrd-ma-SQL_backend/src/test/resourc es/META-INF perfsonar-java-rrd-ma-SQL_backend/src/test/r esources/perfsonar/conf, svn-noreply, 04/30/2013

---

Archive powered by MHonArc 2.6.16.