perfsonar development work

Author: psnc.pietrzak
Date: 2013-02-18 20:27:33 +0000 (Mon, 18 Feb 2013)
New Revision: 6149

Added:
   
trunk/psBase3/perfsonar-base/src/main/resources/net/geant/perfsonar/response/
Removed:
   trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/messaging/
   
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/nmwg/response/
   trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/xpath/
   trunk/psBase3/perfsonar-base/src/main/resources/net/geant/perfsonar/nmwg/
   
trunk/psBase3/perfsonar-base/src/test/java/net/geant/perfsonar/messaging/xpath/
   
trunk/psBase3/perfsonar-base/src/test/java/net/geant/perfsonar/mp/sshtelnet/ConfigurationFileChecker.java
   trunk/psBase3/perfsonar-base/src/test/java/net/geant/perfsonar/xpath/
Modified:
   trunk/psBase3/perfsonar-base/
Log:
Code cleanup.


Property changes on: trunk/psBase3/perfsonar-base
___________________________________________________________________
Modified: svn:ignore
   - target

.settings

.project

   + target
.settings
.project
.classpath


Deleted: 
trunk/psBase3/perfsonar-base/src/test/java/net/geant/perfsonar/mp/sshtelnet/ConfigurationFileChecker.java
===================================================================
--- 
trunk/psBase3/perfsonar-base/src/test/java/net/geant/perfsonar/mp/sshtelnet/ConfigurationFileChecker.java
   2013-02-18 20:07:41 UTC (rev 6148)
+++ 
trunk/psBase3/perfsonar-base/src/test/java/net/geant/perfsonar/mp/sshtelnet/ConfigurationFileChecker.java
   2013-02-18 20:27:33 UTC (rev 6149)
@@ -1,64 +0,0 @@
-package net.geant.perfsonar.mp.sshtelnet;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-import net.geant.perfsonar.LSRegistrationTask;
-import net.geant.perfsonar.xpath.Helper;
-import net.geant.perfsonar.xpath.XPathDeserializer;
-
-import org.xml.sax.InputSource;
-
-import static net.geant.perfsonar.xpath.XPathDeserializer.any;
-import static net.geant.perfsonar.xpath.XPathDeserializer.declarePrefix;
-import static net.geant.perfsonar.xpath.XPathDeserializer.whenXPath;
-
-public class ConfigurationFileChecker implements Runnable {
-
-       private File file = new File("src/test/resources/configuration.xml");
-       private long lastModified = 0;
-       private final SSHTelnetMPService service;
-       
-       public ConfigurationFileChecker(SSHTelnetMPService service) {
-               this.service = service;
-       }
-
-       public void run() {
-               if (!file.exists()) {
-                       System.err.println("Configuration file: " + 
file.getAbsolutePath()
-                                       + " is missing");
-                       return;
-               }
-
-               if (file.lastModified() > lastModified) {
-                       lastModified = file.lastModified();
-                       configureDeserialization();
-                       XPathDeserializer deserializer = new 
XPathDeserializer();
-                       try {
-                               deserializer.deserialize(new InputSource(new 
FileInputStream(file)));
-                       } catch (Exception ex) {
-                               ex.printStackTrace();
-                       }
-               }
-       }       
-       
-       private void configureDeserialization() {
-               //When configuring XPath the configurator creates a subclass 
of SSHTelnetMPService that registers method invocations.
-               //The instance executes base class constructor of 
SSHTelnetMPService which creates this task.
-               //This guard prevents calls from subclass instances forever 
when configuring XPath.
-               if (Helper.isConfigurationInstance(service))
-                       return;
-               
-               declarePrefix("ns", 
"http://service.perfsonar.org/ns/config/base/0.9/";);
-
-               try {
-                       whenXPath(
-                                       
"ns:configuration/ns:service/ns:auxiliaryComponents/ns:component[@name='scheduling']/ns:actions/ns:action[@name='registration']/ns:option[@name='interval']/@value")
-                                       .then(SSHTelnetMPService.class, 
service).setLookupServiceInterval(any(String.class));
-                       
-                       whenXPath(
-                                       
"ns:configuration/ns:service/ns:auxiliaryComponents/ns:component[@name='scheduling']/ns:actions/ns:action[@name='registration']/ns:option[starts-with(@name,
 'lsAddress')]/@value")
-                                       
.then(LSRegistrationTask.class).addLSAddress(any(String.class));
-               } catch (Exception ex) { }
-       }
-}