perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6433 - in trunk: parent perfsonar-java-xml-ls perfsonar-java-xm l-ls/src/main/java/org/perfsonar/service/lookupservice per fsonar-java-xml-ls/src/main/java/org/perfsonar/service/loo kupservice/registerService perfsonar-java-xml-ls/src/main/ java/org/perfsonar/service/lookupservice/registration/summ arization perfsonar-java-xml-ls/src/main/resources perfson ar-java-xml-ls/src/main/resources/perfsonar/conf perfsonar -java-xml-ls/src/main/webapp/data perfsonar-java-xml-ls/sr c/main/webapp/db perfsonar-java-xml-ls/src/test/resources perfsonar-java-xml-ls/src/test/resources/perfsonar/conf

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6433 - in trunk: parent perfsonar-java-xml-ls perfsonar-java-xm l-ls/src/main/java/org/perfsonar/service/lookupservice per fsonar-java-xml-ls/src/main/java/org/perfsonar/service/loo kupservice/registerService perfsonar-java-xml-ls/src/main/ java/org/perfsonar/service/lookupservice/registration/summ arization perfsonar-java-xml-ls/src/main/resources perfson ar-java-xml-ls/src/main/resources/perfsonar/conf perfsonar -java-xml-ls/src/main/webapp/data perfsonar-java-xml-ls/sr c/main/webapp/db perfsonar-java-xml-ls/src/test/resources perfsonar-java-xml-ls/src/test/resources/perfsonar/conf

From:
To:
Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6433 - in trunk: parent perfsonar-java-xml-ls perfsonar-java-xm l-ls/src/main/java/org/perfsonar/service/lookupservice per fsonar-java-xml-ls/src/main/java/org/perfsonar/service/loo kupservice/registerService perfsonar-java-xml-ls/src/main/ java/org/perfsonar/service/lookupservice/registration/summ arization perfsonar-java-xml-ls/src/main/resources perfson ar-java-xml-ls/src/main/resources/perfsonar/conf perfsonar -java-xml-ls/src/main/webapp/data perfsonar-java-xml-ls/sr c/main/webapp/db perfsonar-java-xml-ls/src/test/resources perfsonar-java-xml-ls/src/test/resources/perfsonar/conf
Date: Tue, 4 Jun 2013 19:58:51 +0100 (BST)
Authentication-results: sfpop-ironport04.merit.edu; dkim=neutral (message not signed) header.i=none

Author: dante.delvaux
Date: 2013-06-04 19:58:51 +0100 (Tue, 04 Jun 2013)
New Revision: 6433

Modified:
trunk/parent/pom.xml
trunk/perfsonar-java-xml-ls/
trunk/perfsonar-java-xml-ls/pom.xml

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizationHelper.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Trie.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
trunk/perfsonar-java-xml-ls/src/main/resources/conf.xml

trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml

trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/data/README
trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/db/README
trunk/perfsonar-java-xml-ls/src/test/resources/conf.xml

trunk/perfsonar-java-xml-ls/src/test/resources/perfsonar/conf/configuration.xml
Log:
XML LS: updating pom configuration to be inline with latest parent,
correcting minor CheckStyle and PMD issues.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-06-04 15:20:57 UTC (rev 6432)
+++ trunk/parent/pom.xml 2013-06-04 18:58:51 UTC (rev 6433)
@@ -506,6 +506,11 @@
<version>1.7.5</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>

Property changes on: trunk/perfsonar-java-xml-ls
___________________________________________________________________
Modified: svn:ignore
- target

.classpath

.project

.settings

.gitignore

.externalToolBuilders

logs

.idea

build

.checkstyle

+ target

.classpath

.project

.settings

.gitignore

.externalToolBuilders

logs

.idea

build

.checkstyle

.pmd

.pmdruleset

Added: svn:externals
+
svn+ssh:///GEANT/SA2/ps-java-services/tags/parent/1.0.3/common
common

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2013-06-04 15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2013-06-04 18:58:51 UTC (rev 6433)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

@@ -30,11 +30,8 @@
<configurationFile>log4j.xml</configurationFile>
<axis2Id>axis2-1.4.1</axis2Id>
<packageName>perfsonar-java-xml-ls</packageName>
- <log4j.version>1.2.17</log4j.version>
- <slf4j.version>1.6.6</slf4j.version>
<exist.version>1.2.6</exist.version>
<xmlrpc.version>3.1.2</xmlrpc.version>
- <junit.version>4.8.1</junit.version>
<datadir>data</datadir>
<port>8080</port>
</properties>
@@ -143,42 +140,6 @@
</plugin>

<plugin>
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>1.5.0</version>
- <executions>
- <execution>
- <id>replace.exist</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- <configuration>
- <includes>
-
<include>target/classes/conf.xml</include>
-
<include>target/classes/perfsonar/conf/webAdminConfig.xml</include>
-
<include>target/classes/perfsonar/conf/configuration.xml</include>
- </includes>
- <replacements>
- <replacement>
-
<token>%DATADIR%</token>
-
<value>${datadir}</value>
- </replacement>
- <replacement>
-
<token>%PORT%</token>
-
<value>${port}</value>
- </replacement>
- <replacement>
-
<token>%VERSION%</token>
-
<value>${project.version}</value>
- </replacement>
- </replacements>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
@@ -198,7 +159,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
</plugin>
</plugins>

@@ -208,6 +168,7 @@
<includes>
<include>*.xml</include>
</includes>
+ <filtering>true</filtering>
</testResource>
<testResource>

<directory>${basedir}/src/main/webapp/data</directory>
@@ -234,6 +195,7 @@
<excludes>
<exclude>log4j.xml</exclude>
</excludes>
+ <filtering>true</filtering>
</resource>
<resource>

<directory>${basedir}/src/main/resources/org/perfsonar/resources</directory>
@@ -258,7 +220,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -274,7 +235,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>

@@ -335,31 +295,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jms</artifactId>
- <groupId>javax.jms</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jmxtools</artifactId>
- <groupId>com.sun.jdmk</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jmxri</artifactId>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -523,11 +470,6 @@
<artifactId>xmlParserAPIs</artifactId>
<version>2.6.2</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -214,10 +214,10 @@
q.append("for $d in
/nmwg:store[@type='LSStore']/nmwg:data[\n");
// Add search clauses
int i = 0;
- i += addSearchClause(q, ipAddresses,
"descendant::nmwgt:ifAddress", (i > 0), null);
- i += addSearchClause(q, domains, "descendant::nmwgt:hostName",
(i > 0), "ends-with");
- i += addSearchClause(q, eventTypes,
"descendant::nmwg:eventType", (i > 0), null);
- i += addSearchClause(q, keywords,
"descendant::nmwg:parameter[@name='keyword']",
(i > 0), null);
+ i += addSearchClause(q, ipAddresses,
"descendant::nmwgt:ifAddress", i > 0, null);
+ i += addSearchClause(q, domains, "descendant::nmwgt:hostName", i
> 0, "ends-with");
+ i += addSearchClause(q, eventTypes,
"descendant::nmwg:eventType", i > 0, null);
+ i += addSearchClause(q, keywords,
"descendant::nmwg:parameter[@name='keyword']",
i > 0, null);

q.append("]\nreturn data($d/@metadataIdRef)");

@@ -242,7 +242,7 @@
*/
private int addSearchClause(StringBuffer q, Collection<String>
searchItems, String element, boolean addAnd, String searchFunction) {
int i = 0;
- if ((searchItems.size() > 0) && addAnd) {
+ if (searchItems.size() > 0 && addAnd) {
q.append(" and \n");
}
// Loop on all searchItems

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -1,5 +1,7 @@
package org.perfsonar.service.lookupservice;

+import java.util.NoSuchElementException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -70,10 +72,12 @@
protected Metadata getFirstMetadataFromRequest(Message request)
throws PerfSONARException {

- for (Metadata m : request.getMetadataCollection()) {
- return m;
+ try {
+ return request.getMetadataCollection().iterator().next();
+ } catch (NoSuchElementException ex) {
+ logger.warn("No metadata in request.");
+ return null;
}
- return null;
}

/**

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -78,19 +78,19 @@
reqEvT = requestMetadata.getFirstEventType();

// if no eventType and home LS -- use Service evt. for backward
compatibility
- if ((!isGLS()) && (reqEventType == null)) {
+ if (!isGLS() && reqEventType == null) {
reqEventType = SERVICE_EVENT_TYPE;
logger.debug("Taking default eventType [{}]",
SERVICE_EVENT_TYPE);
}

// check GLS
- if ((SERVICE_EVENT_TYPE.equals(reqEventType) && !isGLS())
- || (SUMMARY_EVENT_TYPE.equals(reqEventType) && isGLS())) {
+ if (SERVICE_EVENT_TYPE.equals(reqEventType) && !isGLS()
+ || SUMMARY_EVENT_TYPE.equals(reqEventType) && isGLS()) {
// OK - no action
logger.debug("eventType accepted [{}]", reqEventType);
} else {
String m = "[LS Registration] no service event type or wrong
eventType! Service is "
- + ((isGLS()) ? "[global-LS] and accepts [" +
SUMMARY_EVENT_TYPE + "]"
+ + (isGLS() ? "[global-LS] and accepts [" +
SUMMARY_EVENT_TYPE + "]"
: "[home-LS] and accepts [" + SERVICE_EVENT_TYPE
+ "]");
logger.error(m);
// TODO: url event types
@@ -195,7 +195,7 @@
}

// remove old Lookup Info as well - if update and there is lookup
info with different key
- if (doRemoveOldKey && (!keyValue.equals(metadataId))) {
+ if (doRemoveOldKey && !keyValue.equals(metadataId)) {
logger.info("Remove old Lookup Info - other key ({})", keyValue);
int num = dao.removeLookupInfo(keyValue);
logger.debug("Removed [{}] old entries", num);

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -25,8 +25,8 @@

// data chains container <String metadataIdRef, ArrayList<Data>>
HashMap<String, Message> dataChains = new HashMap<String, Message>();
- org.perfsonar.base2.xml.Element parameters = null;
- List<org.perfsonar.base2.xml.Element> parametersNodesList =
(List<Element>) reqMessage
+ Element parameters = null;
+ List<Element> parametersNodesList = (List<Element>) reqMessage
.getChildren("parameters");
if (parametersNodesList != null && parametersNodesList.size() == 1) {
parameters = parametersNodesList.get(0);

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -288,10 +288,8 @@
}
}

- for (Metadata m : msg.getMetadataCollection()) {
- m.addChild(createLSKey(keyValue));
- break;
- }
+ // We add the LSKey
+ msg.addChild(createLSKey(keyValue));

// doesn't really matter, it is changed by MessageHandler.
msg.setType("LSRegisterResponse");

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -47,7 +47,7 @@
mallformed = true;
break;
}
- ipInLong = (ipInLong << 8) + temp;
+ ipInLong = (ipInLong << 8) + temp; // NOPMD
}
}

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -119,7 +119,7 @@

if (c0n == null) {
alitn.add(node);
- } else if ((c0n.getMask() - node.getMask() > 8) || (c1n.getMask() -
node.getMask() > 8)) {
+ } else if (c0n.getMask() - node.getMask() > 8 || c1n.getMask() -
node.getMask() > 8) {
walkIpTrie(alitn, c0n);
walkIpTrie(alitn, c1n);
} else {

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizationHelper.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizationHelper.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizationHelper.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -41,9 +41,9 @@

for (int i = 0; i < SummarizationConstants.NR_OF_IP_SEGMENTS; i++) {

- double factor = Math.pow(256,
(SummarizationConstants.NR_OF_IP_SEGMENTS - i - 1));
+ double factor = Math.pow(256,
SummarizationConstants.NR_OF_IP_SEGMENTS - i - 1);
num = ipInLong / (long) factor;
- ipInLong = ipInLong - (num * (long) factor);
+ ipInLong = ipInLong - num * (long) factor;
if (num > 255) {
System.err.println("Invalid IP address ");
}

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Trie.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Trie.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Trie.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -41,7 +41,7 @@
* @return 0 or 1
*/
private long firstDigit(long longIp, long ipLength) {
- return ((longIp >> (ipLength - 1)) & 1);
+ return (longIp >> (ipLength - 1)) & 1;
}

/**
@@ -145,7 +145,7 @@
}

public boolean trieEquals(Trie trie) {
- if (trie != null && (this.getCount() == trie.getCount())) {
+ if (trie != null && this.getCount() == trie.getCount()) {
List<Long> list1 = this.getKeys();
List<Long> list2 = trie.getKeys();

@@ -176,8 +176,7 @@
return false;
}

- private boolean remove(TrieNode node, long key, long keyLength,
- long currentKeyLength) {
+ private boolean remove(TrieNode node, long key, long keyLength, long
currentKeyLength) {

boolean success;
TrieNode child;
@@ -203,8 +202,7 @@
child = node.getChildZero();
}

- success = ((child != null) && remove(child, key, keyLength,
- currentKeyLength));
+ success = child != null && remove(child, key, keyLength,
currentKeyLength);

if (success && child.getValueCount() < 0) {
// check if we need to delete nodes as we go back along the path
@@ -251,7 +249,7 @@
if (childOne != null) {
mostDominantKeyList(childOne, key, position);
}
- if ((node.getChildOne() != null) && (node.getChildZero() != null)) {
+ if (node.getChildOne() != null && node.getChildZero() != null) {
keyList.add(new TrieNode(key, position));
}
}

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
2013-06-04 18:58:51 UTC (rev 6433)
@@ -101,7 +101,7 @@

public boolean trieNodeEquals(TrieNode node) {
return node != null
- && (this.key == node.key && this.keyLength ==
node.keyLength);
+ && this.key == node.key && this.keyLength == node.keyLength;
}

public boolean isKey() {
@@ -146,7 +146,7 @@
long keyLengthCommon = commonKeyAndKeyLength[1];

keyLengthDiff = this.keyLength - keyLengthCommon;
- keyDiff = this.key - (keyCommon << keyLengthDiff);
+ keyDiff = this.key - (keyCommon << keyLengthDiff); // NOPMD

if (keyLengthDiff > 0) {
newNode = new TrieNode(keyDiff, keyLengthDiff);
@@ -181,7 +181,7 @@
if (keyLength > keyLengthCommon) {
// get diff with the new key
keyLengthDiff = keyLength - keyLengthCommon;
- keyDiff = key - (keyCommon << keyLengthDiff);
+ keyDiff = key - (keyCommon << keyLengthDiff); // NOPMD

if (firstDigit(keyDiff, keyLengthDiff) == 1) {
if (this.childOne != null) {
@@ -225,7 +225,7 @@
keyLengthCommon = keyFields[1];

long keyLengthDiff = keyLength - keyLengthCommon;
- long keyDiff = key - (keyCommon << keyLengthDiff);
+ long keyDiff = key - (keyCommon << keyLengthDiff); // NOPMD

if (firstDigit(keyDiff, keyLengthDiff) == 1) {
if (childOne != null) {
@@ -253,7 +253,7 @@
// anything but a leaf, hence a terminator

if (keyLength < this.keyLength
- || (key == this.key && keyLength == this.keyLength)) {
+ || key == this.key && keyLength == this.keyLength) {
return this;
} else {
long[] keyFields = getCommonPart(key, keyLength, this.key,
@@ -262,7 +262,7 @@
long keyLengthCommon = keyFields[1];

long keyLengthDiff = keyLength - keyLengthCommon;
- long keyDiff = key - (keyCommon << keyLengthDiff);
+ long keyDiff = key - (keyCommon << keyLengthDiff); // NOPMD

if (firstDigit(keyDiff, keyLengthDiff) == 1) {
if (childOne != null) {

Modified: trunk/perfsonar-java-xml-ls/src/main/resources/conf.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/resources/conf.xml 2013-06-04
15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/src/main/resources/conf.xml 2013-06-04
18:58:51 UTC (rev 6433)
@@ -64,7 +64,7 @@
defines a protocol stack. Refers the jgroups protocol stack.
-->
<cluster dbaPassword="" dbaUser="admin"
exclude="/db/system,/db/system/config"
- journalDir="%DATADIR%/cluster-journal"
+ journalDir="${DATADIR}/cluster-journal"

protocol="UDP(mcast_addr=228.1.2.3;mcast_port=45566;ip_ttl=8;ip_mcast=true;mcast_send_buf_size=800000;mcast_recv_buf_size=150000;ucast_send_buf_size=800000;ucast_recv_buf_size=150000;loopback=true):PING(timeout=2000;num_initial_members=3;up_thread=true;down_thread=true):MERGE2(min_interval=10000;max_interval=20000):FD(shun=true;up_thread=true;down_thread=true;timeout=2500;max_tries=5):VERIFY_SUSPECT(timeout=3000;num_msgs=3;up_thread=true;down_thread=true):pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800;max_xmit_size=8192;up_thread=true;down_thread=true):UNICAST(timeout=300,600,1200,2400,4800;window_size=100;min_threshold=10;down_thread=true):pbcast.STABLE(desired_avg_gossip=20000;up_thread=true;down_thread=true):FRAG(frag_size=8192;down_thread=true;up_thread=true):pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=true;print_local_addr=true)"/>


<db-connection cacheSize="150M" collectionCache="24M" database="native"
- files="%DATADIR%" pageSize="4096">
+ files="${DATADIR}" pageSize="4096">


<pool max="5" min="1" sync-period="120000"
wait-before-shutdown="10000"/>

- 
- 
+ - timeout-check-interval:
+ time between checking for timed out queries. For value "-1"

+ the time out is switched off, resulting cached queries to
remain
+ in the cache forever.

+ -->
+ 




<validation mode="auto">


Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
2013-06-04 18:58:51 UTC (rev 6433)
@@ -9,8 +9,8 @@

<lookupInformation>
<option name="accessPoint"
-
value="http://localhost:%PORT%/perfsonar-java-xml-ls/services/LookupService"/>
- <option name="serviceName" value="perfSONAR Java - XML LS"/>
+
value="http://localhost:${port}/perfsonar-java-xml-ls/services/LookupService"/>
+ <option name="serviceName" value="${name}"/>
<option name="serviceType" value="LS"/>
</lookupInformation>

@@ -188,7 +188,7 @@




Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-06-04 18:58:51 UTC (rev 6433)
@@ -2,431 +2,517 @@

<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>

- 
- <wa:serviceInformation>
-
<wa:accessPoint>http://localhost:%PORT%/perfsonar-java-xml-ls/services/LookupService</wa:accessPoint>
+ 
+ <wa:serviceInformation>
+
<wa:accessPoint>http://localhost:${port}/perfsonar-java-xml-ls/services/LookupService</wa:accessPoint>
<wa:serviceName>${name}</wa:serviceName>
<wa:version>${version}</wa:version>
- </wa:serviceInformation>
-
- 
- <wa:credential>
- <wa:username>perfsonaruser</wa:username>
- <wa:password>perfsonarpass</wa:password>
- </wa:credential>
-
- <wa:basiclink>
- <wa:pageId>basic</wa:pageId> 
- <wa:title>Service Settings</wa:title>
- </wa:basiclink>
-
- <wa:basiclink>
- <wa:pageId>changePassword</wa:pageId> 
- <wa:title>WebAdmin Settings</wa:title>
- </wa:basiclink>
-
+ </wa:serviceInformation>
+
+ 
+ <wa:credential>
+ <wa:username>perfsonaruser</wa:username>
+ <wa:password>perfsonarpass</wa:password>
+ </wa:credential>
+
<wa:basiclink>
+ <wa:pageId>basic</wa:pageId> 
+ <wa:title>Service Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:pageId>changePassword</wa:pageId> 
+ <wa:title>WebAdmin Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
<wa:servletId>initDb</wa:servletId>
<wa:title>Init exist DB</wa:title>
</wa:basiclink>

- <wa:advancedlink>
- <wa:pageId>advanced</wa:pageId> 
- <wa:title>Detailed 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:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
- </wa:xpath>
- </wa:default>
- <wa:title>
- <wa:text>Username</wa:text>
- </wa:title>
- </wa:textbox>
- </wa:plain>
- <wa:plain>
- <wa:password>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
- </wa:xpath>
- </wa:default>
- <wa:title>
- <wa:text>Password</wa:text>
- </wa:title>
- </wa:password>
- </wa:plain>
- </wa:page>
+ <wa:advancedlink>
+ <wa:pageId>advanced</wa:pageId> 
+ <wa:title>Detailed 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:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Access
point</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Service
name</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Service
type</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB
username</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB
password</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="interval"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Cleanup interval (in
sec.)</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="lsTTL"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Cleanup lsTTL (in
sec.)</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- </wa:page>
-
-
- <wa:page>
- <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
- <wa:title><wa:text>Advanced settings</wa:text></wa:title>
-
- 
-
- <wa:plain>
- <wa:radio>
- <wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
- </wa:default>
- <wa:title><wa:text>EchoRequest message type
should be authenticated?</wa:text></wa:title>
-
<wa:values><wa:text>yes,no</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:radio>
- <wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSRegisterRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
- </wa:default>
- <wa:title><wa:text>LSRegisterRequest message
type should be authenticated?</wa:text></wa:title>
-
<wa:values><wa:text>yes,no</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:radio>
- <wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSQueryRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
- </wa:default>
- <wa:title><wa:text>LSQueryRequest message
type should be authenticated?</wa:text></wa:title>
-
<wa:values><wa:text>yes,no</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:radio>
- <wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSKeepaliveRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
- </wa:default>
- <wa:title><wa:text>LSKeepaliveRequest message
type should be authenticated?</wa:text></wa:title>
-
<wa:values><wa:text>yes,no</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:radio>
- <wa:default>
-
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSDeregisterRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
- </wa:default>
- <wa:title><wa:text>LSDeregisterRequest
message type should be authenticated?</wa:text></wa:title>
-
<wa:values><wa:text>yes,no</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>AS
endpoint</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Access
point</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Service
name</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Service
type</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="url"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB
url</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB
username</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB
password</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="usernameRO"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB username
(read-only)</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="passwordRO"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>eXist DB password
(read-only)</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:option[@name="interval"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Scheduler
interval</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:radio>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="status"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Cleanup action
enabled?</wa:text></wa:title>
-
<wa:values><wa:text>on,off</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="interval"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Cleanup
interval</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="lsTTL"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Cleanup
lsTTL</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
-
- <wa:plain>
- <wa:radio>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="status"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Summarization
enabled?</wa:text></wa:title>
-
<wa:values><wa:text>on,off</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="interval"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Summarization
interval</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="nrOfModifications"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Summarization - number of
modifications</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="nrOfIterations"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>Summarization - number of
iterations</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
-
- <wa:plain>
- <wa:radio>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>gLS registration
enabled?</wa:text></wa:title>
-
<wa:values><wa:text>on,off</wa:text></wa:values>
- </wa:radio>
- </wa:plain>
-
- <wa:plain>
- <wa:textbox>
- <wa:default>
- <wa:xpath>
-
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
- </wa:xpath>
- </wa:default>
- <wa:title><wa:text>gLS registration
interval</wa:text></wa:title>
- </wa:textbox>
- </wa:plain>
+ <wa:map>
+ <wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
+ <wa:ns>ns1</wa:ns>
+ </wa:map>

- </wa:page>
-
+ <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:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Username</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:password>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Password</wa:text>
+ </wa:title>
+ </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>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Access point</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Service name</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Service type</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB username</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB password</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="interval"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Cleanup interval (in sec.)</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="lsTTL"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Cleanup lsTTL (in sec.)</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ </wa:page>
+
+
+ <wa:page>
+ <wa:pageId>
+ <wa:text>advanced</wa:text>
+ </wa:pageId>
+ <wa:title>
+ <wa:text>Advanced settings</wa:text>
+ </wa:title>
+
+ 
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>EchoRequest message type should be
authenticated?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>yes,no</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSRegisterRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>LSRegisterRequest message type should be
authenticated?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>yes,no</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSQueryRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>LSQueryRequest message type should be
authenticated?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>yes,no</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSKeepaliveRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>LSKeepaliveRequest message type should be
authenticated?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>yes,no</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSDeregisterRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>LSDeregisterRequest message type should be
authenticated?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>yes,no</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>AS endpoint</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Access point</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Service name</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Service type</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="url"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB url</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB username</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB password</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="usernameRO"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB username (read-only)</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="passwordRO"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>eXist DB password (read-only)</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:option[@name="interval"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Scheduler interval</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="status"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Cleanup action enabled?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>on,off</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="interval"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Cleanup interval</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSCleanup_1"]/ns1:option[@name="lsTTL"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Cleanup lsTTL</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="status"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Summarization enabled?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>on,off</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="interval"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Summarization interval</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="nrOfModifications"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Summarization - number of
modifications</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="LSSummarySynchronization"]/ns1:option[@name="nrOfIterations"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>Summarization - number of iterations</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:radio>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>gLS registration enabled?</wa:text>
+ </wa:title>
+ <wa:values>
+ <wa:text>on,off</wa:text>
+ </wa:values>
+ </wa:radio>
+ </wa:plain>
+
+ <wa:plain>
+ <wa:textbox>
+ <wa:default>
+ <wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
+ </wa:xpath>
+ </wa:default>
+ <wa:title>
+ <wa:text>gLS registration interval</wa:text>
+ </wa:title>
+ </wa:textbox>
+ </wa:plain>
+
+ </wa:page>
+
</wa:WebAdminInterface>

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/data/README
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/data/README 2013-06-04
15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/data/README 2013-06-04
18:58:51 UTC (rev 6433)
@@ -1 +1 @@
-Directory to hold eXist database files. See conf.xml eXist file.
\ No newline at end of file
+Directory to hold eXist database files. See conf.xml eXist file.

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
2013-06-04 15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
2013-06-04 18:58:51 UTC (rev 6433)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
type="LSStore-control">

-</nmwg:store>
\ No newline at end of file
+</nmwg:store>

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml
2013-06-04 15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml
2013-06-04 18:58:51 UTC (rev 6433)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<nmwg:store
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; type="LSStore-summary">

-</nmwg:store>
\ No newline at end of file
+</nmwg:store>

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/db/README
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/db/README 2013-06-04
15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/README 2013-06-04
18:58:51 UTC (rev 6433)
@@ -1 +1 @@
-Directory containing XML documents to initialise the DB content. Those
files are read-only.
\ No newline at end of file
+Directory containing XML documents to initialise the DB content. Those
files are read-only.

Modified: trunk/perfsonar-java-xml-ls/src/test/resources/conf.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/test/resources/conf.xml 2013-06-04
15:20:57 UTC (rev 6432)
+++ trunk/perfsonar-java-xml-ls/src/test/resources/conf.xml 2013-06-04
18:58:51 UTC (rev 6433)
@@ -102,7 +102,7 @@

Increase the buffer settings for elements_buffers and words_buffers
if
you have some more memory to waste. If you deal with lots of
- collections, you can also increase the collectionCacheSize value
+ collections, you can also increase the collectionCacheSize value
-->
<db-connection cacheSize="160M" collectionCache="24M" database="native"
files="data" pageSize="4096">
@@ -128,7 +128,7 @@
maximum number of connections allowed.

- sync-period:
- defines how often the database will flush its
+ defines how often the database will flush its
internal buffers to disk. The sync thread will interrupt
normal database operation after the specified number of
milliseconds and write all dirty pages to disk.
@@ -148,18 +148,18 @@




<validation mode="auto">


Modified:
trunk/perfsonar-java-xml-ls/src/test/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/test/resources/perfsonar/conf/configuration.xml
2013-06-04 15:20:57 UTC (rev 6432)
+++
trunk/perfsonar-java-xml-ls/src/test/resources/perfsonar/conf/configuration.xml
2013-06-04 18:58:51 UTC (rev 6433)
@@ -13,7 +13,7 @@

<lookupInformation>
<option name="accessPoint"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
- <option name="serviceName" value="perfSONAR Java - XML LS "/>
+ <option name="serviceName" value="${name}"/>
<option name="serviceType" value="LS"/>
</lookupInformation>

[pS-dev] [GEANT/SA2/ps-java-services] r6433 - in trunk: parent perfsonar-java-xml-ls perfsonar-java-xm l-ls/src/main/java/org/perfsonar/service/lookupservice per fsonar-java-xml-ls/src/main/java/org/perfsonar/service/loo kupservice/registerService perfsonar-java-xml-ls/src/main/ java/org/perfsonar/service/lookupservice/registration/summ arization perfsonar-java-xml-ls/src/main/resources perfson ar-java-xml-ls/src/main/resources/perfsonar/conf perfsonar -java-xml-ls/src/main/webapp/data perfsonar-java-xml-ls/sr c/main/webapp/db perfsonar-java-xml-ls/src/test/resources perfsonar-java-xml-ls/src/test/resources/perfsonar/conf, svn-noreply, 06/04/2013

List archive