Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3243 - in trunk/geant2_java-sshtelnet-mp: ant conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters

Subject: perfsonar development work

List archive

perfsonar: r3243 - in trunk/geant2_java-sshtelnet-mp: ant conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3243 - in trunk/geant2_java-sshtelnet-mp: ant conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters
  • Date: Thu, 17 Jan 2008 06:11:34 -0500
Author: melis
Date: 2008-01-17 06:11:33 -0500 (Thu, 17 Jan 2008)
New Revision: 3243

Modified:
trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml

trunk/geant2_java-sshtelnet-mp/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
trunk/geant2_java-sshtelnet-mp/doc/Interface Specification for SSHTelnet
1.3.doc
trunk/geant2_java-sshtelnet-mp/doc/Metadata Configuration file for
SSHTelnet 1.3.doc
trunk/geant2_java-sshtelnet-mp/samples/sshtelnetmptemplate.csv

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestExecutingThread.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestMonitor.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
Log:
added ongoing development + made a bugfix in the documents

Modified: trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-01-17
10:32:38 UTC (rev 3242)
+++ trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-01-17
11:11:33 UTC (rev 3243)
@@ -50,7 +50,7 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071121/perfsonar-base-1.0.20071121.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080115/perfsonar-base-1.0.20080115.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/eventType-rules.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-01-17 10:32:38 UTC (rev 3242)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-01-17 11:11:33 UTC (rev 3243)
@@ -60,7 +60,7 @@
<artifact:dependencies>

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

<localRepository refid="local.repository"/>

Modified:
trunk/geant2_java-sshtelnet-mp/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-sshtelnet-mp/doc/Interface Specification for
SSHTelnet 1.3.doc
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-sshtelnet-mp/doc/Metadata Configuration file for
SSHTelnet 1.3.doc
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-sshtelnet-mp/samples/sshtelnetmptemplate.csv
===================================================================
--- trunk/geant2_java-sshtelnet-mp/samples/sshtelnetmptemplate.csv
2008-01-17 10:32:38 UTC (rev 3242)
+++ trunk/geant2_java-sshtelnet-mp/samples/sshtelnetmptemplate.csv
2008-01-17 11:11:33 UTC (rev 3243)
@@ -1,8 +1,8 @@
-device1@@@ciscotelnet@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@timeout@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device2@@@ciscossh@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@timeout@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device3@@@ciscokey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@timeout@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device4@@@ciscokey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@timeout@@@maxusers@@@passphrase%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device5@@@junipertelnet@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@timeout@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device6@@@juniperssh@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@timeout@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device7@@@juniperkey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@timeout@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
-device8@@@juniperkey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@timeout@@@maxusers@@@passphrase%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
\ No newline at end of file
+device1@@@ciscotelnet@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device2@@@ciscossh@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device3@@@ciscokey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device4@@@ciscokey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@maxusers@@@passphrase%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device5@@@junipertelnet@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device6@@@juniperssh@@@url@@@port@@@prompt@@@rate@@@username@@@password@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device7@@@juniperkey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@maxusers%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
+device8@@@juniperkey@@@url@@@port@@@prompt@@@rate@@@username@@@path_to_key@@@maxusers@@@passphrase%%%command_name1@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name2@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions%%%command_name3@@@command@@@minParamCount@@@maxParamCount@@@cache@@@description@@@syntax@@@regExpressions
\ No newline at end of file

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.ggf.ns.nmwg.base.v2_0.Data;
import org.ggf.ns.nmwg.base.v2_0.Datum;
import org.ggf.ns.nmwg.base.v2_0.EventType;
@@ -26,6 +27,7 @@
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommand;
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommandInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -382,6 +384,7 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

logger.debug("EVENTTYPESTRING: " + eventTypeString);


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -26,6 +26,7 @@
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommand;
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommandInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -378,7 +379,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoKeyBgpAdapter adapter = new CiscoKeyBgpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -26,6 +26,7 @@
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommand;
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommandInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -377,7 +378,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoSshBgpAdapter adapter = new CiscoSshBgpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -26,6 +26,7 @@
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommand;
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommandInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -387,7 +388,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperBgpAdapter adapter = new JuniperBgpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -26,6 +26,7 @@
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommand;
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommandInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -391,7 +392,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperKeyBgpAdapter adapter = new JuniperKeyBgpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -26,6 +26,7 @@
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommand;
import
org.perfsonar.service.measurementPoint.lookingGlassType.bgp.commands.BgpCommandInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -393,7 +394,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperSshBgpAdapter adapter = new JuniperSshBgpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -112,6 +112,8 @@
try {
eventType = metadata[0].getEventType();
eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));
+
} catch (Exception e) {
logger.error("[CISCOADAPTER][TakeAction]" +
e.getStackTrace().toString());
throw new PerfSONARException("error.mp.sshtelnet.command",

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -112,6 +112,8 @@
try {
eventType = metadata[0].getEventType();
eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));
+
} catch (Exception e) {
logger.error("[CISCOKEYADAPTER][TakeAction]" +
e.getStackTrace().toString());
throw new PerfSONARException("error.mp.sshtelnet.command",

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -121,6 +121,8 @@
try {
eventType = metadata[0].getEventType();
eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));
+
} catch (Exception e) {

logger.error("[CISCOSSHADAPTER][TakeAcion]"+e.getStackTrace().toString());
throw new
PerfSONARException("error.mp.sshtelnet.command",

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -112,6 +112,8 @@
try {
eventType = metadata[0].getEventType();
eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));
+
} catch (Exception e) {
logger.error("[JUNIPERADAPTER][TakeAction]" +
e.getStackTrace().toString());
throw new PerfSONARException("error.mp.sshtelnet.command",

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -121,6 +121,8 @@
try {
eventType = metadata[0].getEventType();
eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));
+
} catch (Exception e) {

logger.error("[JUNIPERKEYADAPTER][TakeAction]"+e.getStackTrace().toString());
throw new
PerfSONARException("error.mp.sshtelnet.command",

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -121,6 +121,8 @@
try {
eventType = metadata[0].getEventType();
eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));
+
} catch (Exception e) {

logger.error("[JUNIPERSSHADAPTER][TakeAction]"+e.getStackTrace().toString());
throw new
PerfSONARException("error.mp.sshtelnet.command",

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestExecutingThread.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestExecutingThread.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestExecutingThread.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -34,6 +34,7 @@
private Message resultMessage = null;
private RequestMonitor requestMonitor = null;
private Metadata requestMetadata = null;
+ private long timeout = 0;

public RequestExecutingThread(int id,
String actionType,
@@ -50,7 +51,26 @@
this.requestMonitor = requestMonitor;

this.requestMetadata = requestMetadata;
+ }
+
+ public RequestExecutingThread(int id,
+ String actionType,
+ String serviceEngineString,
+ Message requestMessage,
+ Metadata requestMetadata,
+ RequestMonitor requestMonitor,
+ long timeout) {

+ this.id = id;
+
+ this.actionType = actionType;
+ this.serviceEngineString = serviceEngineString;
+ this.requestMessage = requestMessage;
+ this.requestMonitor = requestMonitor;
+
+ this.requestMetadata = requestMetadata;
+
+ this.timeout = timeout;
}

/**
@@ -59,9 +79,12 @@
*/
public void run() {
try {
- ServiceEngine serviceEngine =
ServiceEngineFactory.getServiceEngine(serviceEngineString);
+ //if (timeout > 0) //timeout <=0 -> no timeout
+ // requestMonitor.startTimer(this, timeout);
+
+ ServiceEngine serviceEngine =
ServiceEngineFactory.getServiceEngine(serviceEngineString);
resultMessage = serviceEngine.takeAction(actionType,
requestMessage);
-
+
// Inclusion of the result code tags
Metadata resultCodeMetadata = new Metadata();
resultCodeMetadata.setId("resultCodeMeta_" +
requestMetadata.getId());
@@ -132,9 +155,7 @@
resultMessage.setMetadata(resultCodeMetadata);
resultMessage.setData(resultCodeData);

- }
-
+ }
requestMonitor.setCompleted(id, resultMessage);
-
}
}

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestMonitor.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestMonitor.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/RequestMonitor.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -8,6 +8,9 @@
*/
package
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters;

+import java.util.Timer;
+import java.util.TimerTask;
+
import org.ggf.ns.nmwg.base.v2_0.Message;

/**
@@ -22,7 +25,7 @@
private int size;
private boolean[] requestsCompletedTable = null;
private Message[] resultMessagesTable = null;
-
+
public RequestMonitor(int size) {

this.size = size;
@@ -88,4 +91,22 @@
return resultMessagesTable;

}
+
+ public void startTimer(RequestExecutingThread thread, long timeout) {
+ Timer timer = new Timer();
+ timer.schedule(new TimeoutTask(thread), timeout);
+ }
+
+ public class TimeoutTask extends TimerTask {
+
+ private RequestExecutingThread thread;
+
+ public TimeoutTask (RequestExecutingThread thread) {
+ this.thread = thread;
+ }
+
+ public void run () {
+ thread.interrupt();
+ }
+ }
}

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -40,6 +40,10 @@
public class ServicePropertiesConfigurator {

private static Namespace NMWG = Namespace.getNamespace("nmwg",
"http://ggf.org/ns/nmwg/base/2.0/";);
+
+ public static String EVENTTYPE_PREFIX =
"http://schemas.perfsonar.net/tools/sshtelnet/";;
+ public static String EVENTTYPE_VERSION = "1.0";
+
String[] lines;
String previousDevices;

@@ -216,11 +220,11 @@
param.setAttribute("name", "password");
param.setAttribute("value", "" +
PasswordEncryptor.encryptPassword(deviceTok.nextToken()));
params.addContent(param);
+ //param = new Element("parameter", NMWG);
+ //param.setAttribute("name", "timeout");
+ //param.setAttribute("value", "" +
deviceTok.nextToken());
+ //params.addContent(param);
param = new Element("parameter", NMWG);
- param.setAttribute("name", "timeout");
- param.setAttribute("value", "" + deviceTok.nextToken());
- params.addContent(param);
- param = new Element("parameter", NMWG);
param.setAttribute("name", "numberOfUsers");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
@@ -259,11 +263,11 @@
param.setAttribute("name", "password");
param.setAttribute("value", "" +
PasswordEncryptor.encryptPassword(deviceTok.nextToken()));
params.addContent(param);
+ //param = new Element("parameter", NMWG);
+ //param.setAttribute("name", "timeout");
+ //param.setAttribute("value", "" +
deviceTok.nextToken());
+ //params.addContent(param);
param = new Element("parameter", NMWG);
- param.setAttribute("name", "timeout");
- param.setAttribute("value", "" + deviceTok.nextToken());
- params.addContent(param);
- param = new Element("parameter", NMWG);
param.setAttribute("name", "numberOfUsers");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
@@ -302,11 +306,11 @@
param.setAttribute("name", "keyUrl");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
+ //param = new Element("parameter", NMWG);
+ //param.setAttribute("name", "timeout");
+ //param.setAttribute("value", "" +
deviceTok.nextToken());
+ //params.addContent(param);
param = new Element("parameter", NMWG);
- param.setAttribute("name", "timeout");
- param.setAttribute("value", "" + deviceTok.nextToken());
- params.addContent(param);
- param = new Element("parameter", NMWG);
param.setAttribute("name", "numberOfUsers");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
@@ -351,11 +355,11 @@
param.setAttribute("name", "password");
param.setAttribute("value", "" +
PasswordEncryptor.encryptPassword(deviceTok.nextToken()));
params.addContent(param);
+ //param = new Element("parameter", NMWG);
+ //param.setAttribute("name", "timeout");
+ //param.setAttribute("value", "" +
deviceTok.nextToken());
+ //params.addContent(param);
param = new Element("parameter", NMWG);
- param.setAttribute("name", "timeout");
- param.setAttribute("value", "" + deviceTok.nextToken());
- params.addContent(param);
- param = new Element("parameter", NMWG);
param.setAttribute("name", "numberOfUsers");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
@@ -394,11 +398,11 @@
param.setAttribute("name", "password");
param.setAttribute("value", "" +
PasswordEncryptor.encryptPassword(deviceTok.nextToken()));
params.addContent(param);
+ //param = new Element("parameter", NMWG);
+ //param.setAttribute("name", "timeout");
+ //param.setAttribute("value", "" +
deviceTok.nextToken());
+ //params.addContent(param);
param = new Element("parameter", NMWG);
- param.setAttribute("name", "timeout");
- param.setAttribute("value", "" + deviceTok.nextToken());
- params.addContent(param);
- param = new Element("parameter", NMWG);
param.setAttribute("name", "numberOfUsers");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
@@ -437,11 +441,11 @@
param.setAttribute("name", "keyUrl");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
+ //param = new Element("parameter", NMWG);
+ //param.setAttribute("name", "timeout");
+ //param.setAttribute("value", "" +
deviceTok.nextToken());
+ //params.addContent(param);
param = new Element("parameter", NMWG);
- param.setAttribute("name", "timeout");
- param.setAttribute("value", "" + deviceTok.nextToken());
- params.addContent(param);
- param = new Element("parameter", NMWG);
param.setAttribute("name", "numberOfUsers");
param.setAttribute("value", "" + deviceTok.nextToken());
params.addContent(param);
@@ -715,7 +719,7 @@
param.setAttribute("value",
PasswordEncryptor.encryptPassword(input));
params.addContent(param);

- System.out.println("Please give the timeout for the
device: " + device + "(enter 0 if you don't want to use a timeout): ");
+ /*System.out.println("Please give the timeout for
the device: " + device + "(enter 0 if you don't want to use a timeout): ");
input = br.readLine();
valid = false;
while (!valid){
@@ -733,7 +737,7 @@
param = new Element("parameter", NMWG);
param.setAttribute("name", "timeout");
param.setAttribute("value", input);
- params.addContent(param);
+ params.addContent(param);*/
System.out.println("Please give the maximum number
of users for the device: " + device + "(enter 0 if you want an unlimited
amount of users): ");
input = br.readLine();
valid = false;
@@ -860,7 +864,7 @@

}

- System.out.println("Please give the timeout for the
device: " + device + "(enter 0 if you don't want to use a timeout): ");
+ /*System.out.println("Please give the timeout for
the device: " + device + "(enter 0 if you don't want to use a timeout): ");
input = br.readLine();
valid = false;
while (!valid){
@@ -878,7 +882,7 @@
param = new Element("parameter", NMWG);
param.setAttribute("name", "timeout");
param.setAttribute("value", input);
- params.addContent(param);
+ params.addContent(param);*/
System.out.println("Please give the maximum number
of users for the device: " + device + "(enter 0 if you want an unlimited
amount of users): ");
input = br.readLine();
valid = false;
@@ -1289,7 +1293,7 @@
//System.out.println("[DEBUG] parameter elements made...");

eventType = new Element("eventType", NMWG);
- eventType.addContent(command);
+ eventType.addContent(EVENTTYPE_PREFIX + command + "/" +
EVENTTYPE_VERSION);

key.addContent(eventType);
//System.out.println("[DEBUG] eventTypes added to key
element...");

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -49,9 +49,6 @@
private Message[] messages;
private static int[] count;

- private long[] startTimes;
- private long[] endTimes;
-
// ---------------------- class-fields
private LoggerComponent logger = null;
private MetadataConfiguration configuration = null;
@@ -143,11 +140,14 @@

if (deviceElementOK && devices.contains(value)) {

+ logger.debug("Device: " + value);
+ logger.debug("Device index: " +
devices.indexOf(value));
count[devices.indexOf(value)]++;
currentDevices[i] = devices.indexOf(value);
//contains the indexes of the devices in use
- logger.debug("Number of current connections for
device \"" + value + "\": " + count[devices.indexOf(value)]);
+ logger.debug("Number of current connections for
device \"" + value + "\": " + count[currentDevices[i]]);

- if (count[devices.indexOf(value)] <=
Integer.parseInt(configuration.getProperty(value, "numberOfUsers"))){
+ if (Integer.parseInt(configuration.getProperty(value,
"numberOfUsers")) <= 0 // numberOfUsers <= 0 --> unlimited amount of users
+ || count[devices.indexOf(value)] <=
Integer.parseInt(configuration.getProperty(value, "numberOfUsers"))){

Message message = new Message();
message.setMetadata(requestMetadata[i]);
@@ -162,10 +162,14 @@

String serviceEngineString =
configuration.getProperty(value, "class_name");

+ //RequestExecutingThread requestExecutingThread =
new RequestExecutingThread(
+ // i, actionType, serviceEngineString,
message,
+ // requestMetadata[i], requestMonitor,
Long.parseLong(configuration.getProperty(value, "timeout")));
+
RequestExecutingThread requestExecutingThread =
new RequestExecutingThread(
i, actionType, serviceEngineString,
message,
requestMetadata[i], requestMonitor);
-
+
requestExecutingThread.start();
} else {
messages[i] = new Message();
@@ -293,8 +297,11 @@
}

for (int i = 0; i<currentDevices.length; i++) {
- if (currentDevices[i] > -1)
- count[currentDevices[i]]--;
+ if (currentDevices[i] > -1) {
+ count[currentDevices[i]]--;
+ logger.debug("Concurrent connections for device \"" +
devices.get(i) +
+ "\" decreased by 1; concurrent
connections: "+ count[currentDevices[i]]);
+ }
}

return returnMessage;

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -399,7 +400,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoIpAdapter adapter = new CiscoIpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -25,6 +25,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -425,7 +426,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
CiscoKeyIpAdapter adapter = new CiscoKeyIpAdapter();

//adapter.connect(subject);

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -389,7 +390,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoSshIpAdapter adapter = new CiscoSshIpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -402,7 +403,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
JuniperIpAdapter adapter = new JuniperIpAdapter();
//adapter.connect(subject);


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -406,7 +407,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
JuniperKeyIpAdapter adapter = new JuniperKeyIpAdapter();

//adapter.connect(subject);

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.IpAdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ip.commands.IpCommand;
@@ -404,7 +405,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperSshIpAdapter adapter = new JuniperSshIpAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -385,7 +386,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoIpv6Adapter adapter = new CiscoIpv6Adapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -383,7 +384,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoKeyIpv6Adapter adapter = new CiscoKeyIpv6Adapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -379,7 +380,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoSshIpv6Adapter adapter = new CiscoSshIpv6Adapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -393,7 +394,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperIpv6Adapter adapter = new JuniperIpv6Adapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -397,7 +398,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperKeyIpv6Adapter adapter = new JuniperKeyIpv6Adapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.Ipv6AdapterInterface;
import
org.perfsonar.service.measurementPoint.lookingGlassType.ipv6.commands.Ipv6Command;
@@ -393,7 +394,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperSshIpv6Adapter adapter = new JuniperSshIpv6Adapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -84,14 +84,19 @@
String result = "";


- if (property.equalsIgnoreCase("url") ||
property.equalsIgnoreCase("class_name") || property.equalsIgnoreCase("port")
|| property.equalsIgnoreCase("prompt") || property.equalsIgnoreCase("rate")
|| property.equalsIgnoreCase("username") ||
property.equalsIgnoreCase("password") || property.equalsIgnoreCase("cache")
|| property.equalsIgnoreCase("keyUrl") ||
property.equalsIgnoreCase("passphrase")) {
+ if (property.equalsIgnoreCase("url") ||
property.equalsIgnoreCase("class_name")
+ || property.equalsIgnoreCase("port") ||
property.equalsIgnoreCase("prompt")
+ || property.equalsIgnoreCase("rate") ||
property.equalsIgnoreCase("username")
+ || property.equalsIgnoreCase("password") ||
property.equalsIgnoreCase("cache")
+ || property.equalsIgnoreCase("keyUrl") ||
property.equalsIgnoreCase("passphrase")
+ || property.equalsIgnoreCase("timeout") ||
property.equalsIgnoreCase("numberOfUsers")) {
query += "declare namespace
nmwg='http://ggf.org/ns/nmwg/base/2.0/';\n";
query += "for $i in doc(\"" + metadataFile +
"\")/nmwg:store/nmwg:metadata\n";
query += "where $i/nmwg:subject=\"" + device + "\"\n";
query += "return
fn:data($i/nmwg:parameters/nmwg:parameter[@name=\""
+ property + "\"]/@value)";
}

- logger.debug("[DbMetadataConfiguration] query: " + query);
+ //logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -144,7 +149,7 @@
query += "return
fn:data($file/nmwg:store/nmwg:data[@metadataIdRef=$i]/nmwg:key[nmwg:eventType='"
+ command +
"']/nmwg:parameters/nmwg:parameter[@name='"
+ property + "']/@value)\n";
}

- logger.debug("[DbMetadataConfiguration] query: " + query);
+ //logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -191,7 +196,7 @@
query += "return data($i)";
}

- logger.debug("[DbMetadataConfiguration] query: " + query);
+ //logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -211,7 +216,7 @@
"DbMetadataConfiguration.getProperties: " + "Result
array of metadata search in null");
}

- logger.debug("DbMetadataConfiguration.getProperties: " + "The number
of elements returned as a result of xquery statement: " + xmlResults.length);
+ //logger.debug("DbMetadataConfiguration.getProperties: " + "The
number of elements returned as a result of xquery statement: " +
xmlResults.length);

if (xmlResults.length == 0) {
throw new PerfSONARException(
@@ -257,7 +262,7 @@
query += "return
fn:data($file/nmwg:store/nmwg:data[@metadataIdRef=$i]/nmwg:key/nmwg:eventType)\n";
}

- logger.debug("[DbMetadataConfiguration] query: " + query);
+ //logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -277,7 +282,7 @@
"DbMetadataConfiguration.getProperties: " + "Result
array of metadata search in null");
}

- logger.debug("DbMetadataConfiguration.getProperties: " + "The number
of elements returned as a result of xquery statement: " + xmlResults.length);
+ //logger.debug("DbMetadataConfiguration.getProperties: " + "The
number of elements returned as a result of xquery statement: " +
xmlResults.length);

if (xmlResults.length == 0) {
throw new PerfSONARException(

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -386,7 +387,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoKeyStatusAdapter adapter = new CiscoKeyStatusAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -387,7 +388,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoSshStatusAdapter adapter = new CiscoSshStatusAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -405,7 +406,7 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
-
+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

CiscoStatusAdapter adapter = new CiscoStatusAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -400,7 +401,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperKeyStatusAdapter adapter = new JuniperKeyStatusAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -393,7 +394,9 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

+
logger.debug("EVENTTYPESTRING: " + eventTypeString);

JuniperSshStatusAdapter adapter = new JuniperSshStatusAdapter();

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
2008-01-17 10:32:38 UTC (rev 3242)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
2008-01-17 11:11:33 UTC (rev 3243)
@@ -24,6 +24,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ServiceEngine;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator;
import
org.perfsonar.service.measurementPoint.lookingGlassType.engine.commands.ParameterChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
@@ -410,6 +411,7 @@

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();
+ //eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

logger.debug("EVENTTYPESTRING: " + eventTypeString);



  • perfsonar: r3243 - in trunk/geant2_java-sshtelnet-mp: ant conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters doc samples src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters, svnlog, 01/17/2008

Archive powered by MHonArc 2.6.16.

Top of Page