perfsonar-dev - perfsonar: r3156 - in trunk/geant2_java-sshtelnet-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata

Subject: perfsonar development work

List archive

perfsonar: r3156 - in trunk/geant2_java-sshtelnet-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata

From:
To:
Subject: perfsonar: r3156 - in trunk/geant2_java-sshtelnet-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata
Date: Thu, 20 Dec 2007 09:24:05 -0500

Author: melis
Date: 2007-12-20 09:24:03 -0500 (Thu, 20 Dec 2007)
New Revision: 3156

Modified:
trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/const.properties
trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt
trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt
trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt

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/metadata/DbMetadataConfiguration.java
Log:
added ongoing development

Modified: trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml 2007-12-20
14:11:43 UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml 2007-12-20
14:24:03 UTC (rev 3156)
@@ -98,8 +98,8 @@

<entry key="service.mp.class_name"
value="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter"/>

- <entry key="component.mp.xmldb.db_uri"
value="xmldb:exist://localhost:8680/exist/xmlrpc"/>
- <entry key="component.mp.xmldb.db_uri.xmlrpc"
value="xmldb:exist://localhost:8680/exist/xmlrpc"/>
+ <entry key="component.mp.xmldb.db_uri"
value="xmldb:exist://localhost:8680/exist/xmlrpc/db"/>
+ <entry key="component.mp.xmldb.db_uri.xmlrpc"
value="xmldb:exist://localhost:8680/exist/xmlrpc/db"/>
<entry key="component.mp.xmldb.db_username"
value="sshtelnet"/>
<entry key="component.mp.xmldb.db_password"
value="sshtelnet"/>
<entry key="component.mp.xmldb.db_access"
value="xmlrpc"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2007-12-20 14:11:43
UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2007-12-20 14:24:03
UTC (rev 3156)
@@ -11,7 +11,7 @@
service.name=JAVA-SSHTELNET-MP

jarfilename=perfsonar-sshtelnet-mp
-version=1.2.1
+version=1.3-RC1

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2007-12-20 14:11:43 UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2007-12-20 14:24:03 UTC (rev 3156)
@@ -11,7 +11,7 @@
service.name=JAVA-SSHTELNET-MP

jarfilename=perfsonar-sshtelnet-mp
-version=1.2.1
+version=1.3-RC1

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt 2007-12-20
14:11:43 UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt 2007-12-20
14:24:03 UTC (rev 3156)
@@ -1,8 +1,8 @@
-IPv6_SHOW_ROUTE@@@show ipv6 route@@@1@@@1@@@cache@@@display IPv6 routing
table entry for <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
+IPv6_SHOW_ROUTE@@@show ipv6 route@@@1@@@1@@@cache@@@display IPv6 routing
table entry for <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_INTERFACE@@@show ipv6 interface@@@1@@@1@@@cache@@@display the
interfaces which are configured for IPv6@@@<interface>@@@---
IPv6_SHOW_ACCESS_LIST@@@show ipv6 access-list@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
IPv6_BGP_TABLE@@@show bgp ipv6@@@1@@@1@@@cache@@@display current BGP table
routing entry for <IPv6 prefix>@@@<IPv6 prefix network/length>@@@---
IPv6_BGP_SUMMARY@@@show bgp ipv6 summary@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_FLAP-STATISTICS@@@show bgp ipv6
flap-statistics@@@0@@@0@@@cache@@@display IPv6 BGP flap statistics@@@---@@@---
-IPv6_PING@@@ping ipv6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
-IPv6_TRACEROUTE@@@trace ipv6@@@1@@@1@@@cache@@@trace the ipv6 path to <ipv6
address>@@@<ipv6 address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
\ No newline at end of file
+IPv6_PING@@@ping ipv6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_TRACEROUTE@@@trace ipv6@@@1@@@1@@@cache@@@trace the ipv6 path to <ipv6
address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2007-12-20
14:11:43 UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2007-12-20
14:24:03 UTC (rev 3156)
@@ -5,10 +5,10 @@
STATUS_SHOW_INTERFACE_CONFIGURATION@@@show running
interface@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IPv6_SHOW_ROUTE@@@show ipv6 route@@@1@@@1@@@cache@@@display IPv6 routing
table entry for <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
+IPv6_SHOW_ROUTE@@@show ipv6 route@@@1@@@1@@@cache@@@display IPv6 routing
table entry for <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_TABLE@@@show bgp ipv6@@@1@@@1@@@cache@@@display current BGP table
routing entry for <IPv6 prefix>@@@<IPv6 prefix network/length>@@@---
-IPv6_PING@@@ping ipv6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
-IPv6_TRACEROUTE@@@trace ipv6@@@1@@@1@@@cache@@@trace the ipv6 path to <ipv6
address>@@@<ipv6 address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
+IPv6_PING@@@ping ipv6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_TRACEROUTE@@@trace ipv6@@@1@@@1@@@cache@@@trace the ipv6 path to <ipv6
address>@@@<ipv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
STATUS_SHOW_MPLS_L2_VC_DETAIL@@@show mpls l2transport vc
detail@@@0@@@0@@@cache@@@display detailed information about Any Transport
over MPLS (AToM) virtual circuits (VCs)@@@---@@@---
IP_SHOW_ROUTE_VRF@@@show ip route vrf@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<VPN name>@@@---
IP_PING_VRF@@@ping vrf@@@1@@@1@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$

Modified: trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt 2007-12-20
14:11:43 UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperipv6commands.txt 2007-12-20
14:24:03 UTC (rev 3156)
@@ -1,7 +1,7 @@
-IPv6_SHOW_ROUTE@@@show route table inet6@@@1@@@1@@@cache@@@display IPv6
routing table entry for <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
+IPv6_SHOW_ROUTE@@@show route table inet6@@@1@@@1@@@cache@@@display IPv6
routing table entry for <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_INTERFACES@@@show interfaces@@@2@@@2@@@cache@@@display the interfaces
which are configured for IPv6@@@<interface> extensive@@@.* extensive$
IPv6_SHOW_ACCESS_LIST@@@show interfaces filters@@@0@@@0@@@cache@@@display
IPv6 access lists@@@---@@@---
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@description@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@description@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_SUMMARY@@@show bgp summary@@@0@@@0@@@cache@@@display the status of
all current IPv6 BGP connections@@@---@@@---
-IPv6_PING@@@ping inet6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
-IPv6_TRACEROUTE@@@traceroute inet6@@@1@@@1@@@cache@@@trace the ipv6 path to
<ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
\ No newline at end of file
+IPv6_PING@@@ping inet6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_TRACEROUTE@@@traceroute inet6@@@1@@@1@@@cache@@@trace the ipv6 path to
<ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2007-12-20 14:11:43 UTC (rev 3155)
+++ trunk/geant2_java-sshtelnet-mp/conf/juniperminimumpackage.txt
2007-12-20 14:24:03 UTC (rev 3156)
@@ -5,10 +5,10 @@
STATUS_SHOW_INTERFACE_CONFIGURATION@@@show configuration
interfaces@@@1@@@1@@@cache@@@display the interface configuration for
<interface>@@@<interface>@@@---
IP_PING@@@ping@@@4@@@4@@@cache@@@ping an <ip address>@@@<ip address> count 5
rapid@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})? count
5 rapid$
IP_TRACEROUTE@@@traceroute@@@1@@@1@@@cache@@@trace the IPv4 path to <ip
address>@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IPv6_SHOW_ROUTE@@@show route table inet6@@@1@@@1@@@cache@@@display IPv6
routing table entry for <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
-IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@description@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
-IPv6_PING@@@ping inet6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
-IPv6_TRACEROUTE@@@traceroute inet6@@@1@@@1@@@cache@@@trace the ipv6 path to
<ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9](\/[0-9]{1,3})?$
+IPv6_SHOW_ROUTE@@@show route table inet6@@@1@@@1@@@cache@@@display IPv6
routing table entry for <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_BGP_TABLE@@@show route protocol bgp table
inet6@@@1@@@1@@@cache@@@description@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_PING@@@ping inet6@@@1@@@1@@@cache@@@ping an <ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
+IPv6_TRACEROUTE@@@traceroute inet6@@@1@@@1@@@cache@@@trace the ipv6 path to
<ipv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
STATUS_MPLS_L2_VC_DETAIL@@@show l2circuit connections
extensive@@@0@@@0@@@cache@@@display detailled information about Any Transport
over MPLS (AToM) virtual circuits
(VCs)@@@---@---
IP_SHOW_ROUTE_VRF@@@show route table@@@1@@@1@@@cache@@@display the IP
routing table associated with a Virtual Private Network (VPN)
routing/forwarding instance (VRF)@@@<routing-instance name>@@@---
IP_PING_VRF@@@ping@@@3@@@3@@@cache@@@pings an <ip address> that has a
specific VRF@@@<ip address> routing-instance <routing-instance
name>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?
routing-instance .*$

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
2007-12-20 14:11:43 UTC (rev 3155)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-12-20 14:24:03 UTC (rev 3156)
@@ -156,11 +156,11 @@
String deviceType;
//String[] devicesArray = new String[lines.length];

- System.out.println("[DEBUG] number of lines to be
parsed: " + lines.length);
+ //System.out.println("[DEBUG] number of lines to be
parsed: " + lines.length);

for (int i=0; i<lines.length && lines[i] != null;
i++){

- System.out.println("[DEBUG] line: "+lines[i]);
+ //System.out.println("[DEBUG] line:
"+lines[i]);

metadata = new Element("metadata", NMWG);
metadata.setAttribute("id", "metadata" + i);
@@ -413,7 +413,6 @@

store.addContent(metadata);

- System.out.println("[DEBUG] Store has
"+store.getChildren("metadata", NMWG).size()+ " metadata elements");

File tempFile =
File.createTempFile(device+"commands", ".tmp");
DataOutputStream dos = new
DataOutputStream(new FileOutputStream(tempFile, true));
@@ -421,7 +420,6 @@
while (tok.hasMoreTokens()) {
//Then write all command info to a
temporary file
String s = tok.nextToken();
- System.out.println("[DEBUG] Token to
parse: "+ s);
dos.writeBytes(s+"\n");
dos.flush();
}
@@ -429,11 +427,8 @@
dos.close();

data = new Element("data", NMWG);
- System.out.println("[DEBUG] Data Element
created");
data.setAttribute("id", "data" + i);
- System.out.println("[DEBUG] Data Element
attribute set: \"id\"="+data.getAttributeValue("id"));
data.setAttribute("metadataIdRef", "metadata"
+ i);
- System.out.println("[DEBUG] Data Element
attribute set: \"metadataIdRef\"="+data.getAttributeValue("metadataIdRef"));

//Then use this temporary file for writing
all command info
@@ -441,7 +436,6 @@

store.addContent(data);

- System.out.println("[DEBUG] Store has
"+store.getChildren("data", NMWG).size()+ " data elements");

}

@@ -1013,8 +1007,6 @@

public void addSelectedCommandsToConfig(String device, String
outputFile, String inputFile) {
- System.out.println("[DEBUG]
addSelectedCommandsToConfig("+device+", "+outputFile+","+ inputFile+")
called");
-
File inputfile = new File(inputFile);

String input = "";
@@ -1024,8 +1016,6 @@

input = br.readLine();

- System.out.println("[DEBUG] Line read: " + input);
-
String command = "";
String realCommand = "";
String minParamCount = "";
@@ -1052,24 +1042,19 @@
params = new Element("parameters", NMWG);
params.setAttribute("id", "params0");

- System.out.println("[DEBUG] Tokenizer
made...");
-
command = tok.nextToken();
- System.out.println("[DEBUG] Command: " +
command);
realCommand = tok.nextToken();
- System.out.println("[DEBUG] Real Command: " +
realCommand);
minParamCount = tok.nextToken();
- System.out.println("[DEBUG] MinParamCount: "
+ minParamCount);
maxParamCount = tok.nextToken();
- System.out.println("[DEBUG] MaxParamCount: "
+ maxParamCount);
+ //System.out.println("[DEBUG] MaxParamCount:
" + maxParamCount);
cache = tok.nextToken();
- System.out.println("[DEBUG] Cache: " + cache);
+ //System.out.println("[DEBUG] Cache: " +
cache);
description = tok.nextToken();
- System.out.println("[DEBUG] Description: " +
description);
+ //System.out.println("[DEBUG] Description: "
+ description);
syntax = tok.nextToken();
- System.out.println("[DEBUG] Syntax: " +
syntax);
+ //System.out.println("[DEBUG] Syntax: " +
syntax);
regExp = tok.nextToken();
- System.out.println("[DEBUG] RegExp: " +
regExp);
+ //System.out.println("[DEBUG] RegExp: " +
regExp);

param = new Element("parameter", NMWG);
param.setAttribute("name","command");
@@ -1117,23 +1102,23 @@
param.setAttribute("value",regExp);
params.addContent(param);
}
- System.out.println("[DEBUG] parameter
elements made...");
+ //System.out.println("[DEBUG] parameter
elements made...");

eventType = new Element("eventType", NMWG);
eventType.addContent(command);

key.addContent(eventType);
- System.out.println("[DEBUG] eventTypes added
to key element...");
+ //System.out.println("[DEBUG] eventTypes
added to key element...");
key.addContent(params);
- System.out.println("[DEBUG] parameters added
to key element...");
+ //System.out.println("[DEBUG] parameters
added to key element...");
data.addContent(key);
- System.out.println("[DEBUG] key added to data
element...");
+ //System.out.println("[DEBUG] key added to
data element...");

- System.out.println("[DEBUG] Number of keys
inside the data element: "+data.getChildren("key", NMWG).size());
+ //System.out.println("[DEBUG] Number of keys
inside the data element: "+data.getChildren("key", NMWG).size());

input = br.readLine();
- System.out.println("[DEBUG] Line read: " +
input);
+ //System.out.println("[DEBUG] Line read: " +
input);
}
} catch (FileNotFoundException e) {
e.printStackTrace();

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
2007-12-20 14:11:43 UTC (rev 3155)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2007-12-20 14:24:03 UTC (rev 3156)
@@ -91,7 +91,7 @@
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 +=
"fn:data($i/nmwg:parameters/nmwg:parameter[@name=\""
+ property + "\"]/@value)";
+ query += "return
fn:data($i/nmwg:parameters/nmwg:parameter[@name=\""
+ property + "\"]/@value)";
}

logger.debug("[DbMetadataConfiguration] query: " + query);
@@ -138,7 +138,7 @@

if (property.equalsIgnoreCase("description") ||
property.equalsIgnoreCase("command")
- || property.equalsIgnoreCase("minParamCount")
|| property.equalsIgnoreCase("maxParamCoung")
+ || property.equalsIgnoreCase("minParamCount")
|| property.equalsIgnoreCase("maxParamCount")
|| property.equalsIgnoreCase("caching") ||
property.equalsIgnoreCase("syntax")
|| property.equalsIgnoreCase("regex")){
query += "declare namespace
nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";\n";;
@@ -340,7 +340,6 @@
if (xmldbAccess == null || xmldbAccess.equals(""))
xmldbAccess = "http";

- System.out.println("db_access: " + xmldbAccess);

XmlDbDataRepository dataRepository =
ExistDbFactory.getDataRepositoryByProperties(
@@ -349,19 +348,12 @@
"component.mp.xmldb.db_username",
"component.mp.xmldb.db_password");

- System.out.println("XmlDataRepositoryUri : "+
dataRepository.getDbUri());
- System.out.println("XmlDataRepositoryPassword: "+
dataRepository.getDbPassword());
- System.out.println("XmlDataRepositoryUsername: "+
dataRepository.getDbUsername());
- System.out.println("XmlDataRepositoryType : "+
dataRepository.getType());
-
XmlDbStorageManager storageManager =
ExistDbFactory.getXMLStorageManager(
xmldbAccess, dataRepository);
storageManager.setResultType(
XmlDbStorageManager.STRING_ARRAY_TYPE);

- System.out.println("storageManager: " + storageManager);
-
return storageManager;

}

perfsonar: r3156 - in trunk/geant2_java-sshtelnet-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata, svnlog, 12/20/2007

List archive

perfsonar: r3156 - in trunk/geant2_java-sshtelnet-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata