Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5403 - in branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice: . registration/summarization servlets

Subject: perfsonar development work

List archive

perfsonar: r5403 - in branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice: . registration/summarization servlets


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5403 - in branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice: . registration/summarization servlets
  • Date: Thu, 10 Dec 2009 06:43:47 -0500
Author: trzaszcz
Date: 2009-12-10 06:43:47 -0500 (Thu, 10 Dec 2009)
New Revision: 5403

Modified:

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/EchoServiceEngine.java

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrieNode.java

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
Log:
code enhancement, Exist db initialization servlet improved - removes all
files existing in store collection

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/EchoServiceEngine.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/EchoServiceEngine.java
2009-12-10 11:14:15 UTC (rev 5402)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/EchoServiceEngine.java
2009-12-10 11:43:47 UTC (rev 5403)
@@ -24,11 +24,11 @@
private static final Logger logger = Logger
.getLogger(EchoServiceEngine.class.getName());

- public final static String[] SUPPORTED_SELFTEST_EVENT_TYPES = {
+ private final static String[] SUPPORTED_SELFTEST_EVENT_TYPES = {

"http://schemas.perfsonar.net/tools/admin/echo/ls/2.0";,

"http://schemas.perfsonar.net/tools/admin/selftest/1.0"; };

- public final static String[] SUPPORTED_ECHO_EVENT_TYPES = {
"http://schemas.perfsonar.net/tools/admin/echo/2.0";, };
+ private final static String[] SUPPORTED_ECHO_EVENT_TYPES = {
"http://schemas.perfsonar.net/tools/admin/echo/2.0";, };

/**
* Constructor

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
2009-12-10 11:14:15 UTC (rev 5402)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
2009-12-10 11:43:47 UTC (rev 5403)
@@ -87,12 +87,6 @@
// check eventType

reqEvT = requestMetadata.getFirstEventType();
- if (reqEventType != null) {
- reqEventType = reqEvT.getEventType();
- logger.debug("service event type is [" + reqEventType
+ "]");
- } else {
- logger.debug("[LS Registration] No event type in
metadata");
- }

// if no eventType and home LS -- use Service evt.
// for backward compatibility

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java
2009-12-10 11:14:15 UTC (rev 5402)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrie.java
2009-12-10 11:43:47 UTC (rev 5403)
@@ -56,7 +56,6 @@
IpTrieNode c0ipTrieNode = new IpTrieNode(c0,
c0Position, c0Key);
nodelist.add(c0ipTrieNode);
node.setChildZero(c0ipTrieNode);
- c0ipTrieNode.setParent(node);
walkTree(c0ipTrieNode, c0Position, c0Key);

}
@@ -67,7 +66,6 @@
IpTrieNode c1ipTrieNode = new IpTrieNode(c1,
c1Position, c1Key);
nodelist.add(c1ipTrieNode);
node.setChildOne(c1ipTrieNode);
- c1ipTrieNode.setParent(node);
walkTree(c1ipTrieNode, c1Position, c1Key);
}


Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrieNode.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrieNode.java
2009-12-10 11:14:15 UTC (rev 5402)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IpTrieNode.java
2009-12-10 11:43:47 UTC (rev 5403)
@@ -11,12 +11,10 @@
class IpTrieNode {

long mask;
- long ipAddress;
long key;
String keyString;
String addrString;
TrieNode trieNode;
- IpTrieNode parent;
IpTrieNode childZero, childOne;
long childCount;

@@ -30,11 +28,6 @@
childCount = tnode.getChildCount();
}

- public IpTrieNode setParent(IpTrieNode newParent) {
- parent = newParent;
- return this;
- }
-
public IpTrieNode setChildZero(IpTrieNode newChild) {
childZero = newChild;
return this;

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
2009-12-10 11:14:15 UTC (rev 5402)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/TrieNode.java
2009-12-10 11:43:47 UTC (rev 5403)
@@ -360,7 +360,6 @@
TrieNode node = this;

if (key == -1) {
- addrString = keyString = "0.0.0.0/0";
currentKey = 0;
} else {
key = currentKey;
@@ -409,7 +408,6 @@
TrieNode node = this;

if (key == -1) {
- addrString = keyString = "0.0.0.0/0";
currentKey = 0;
} else {
key = currentKey;

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2009-12-10 11:14:15 UTC (rev 5402)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2009-12-10 11:43:47 UTC (rev 5403)
@@ -95,7 +95,12 @@
Collection copyCollection = colMngmtService
.createCollection("copy");

- colMngmtService.createCollection("ls/store");
+ // removes all existing resources from store
collection (remove old registered service stored in collection)
+ Collection
storeCollection=colMngmtService.createCollection("ls/store");
+
+ for(String
resourceName:storeCollection.listResources()){
+
storeCollection.removeResource(storeCollection.getResource(resourceName));
+ }

User user = new User(

existDbComponent.getCredential().getUsername(),


  • perfsonar: r5403 - in branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice: . registration/summarization servlets, svnlog, 12/10/2009

Archive powered by MHonArc 2.6.16.

Top of Page