perfsonar-dev - perfsonar: r4611 - in branches/geant2_java-sshtelnet-mp-RELEASE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/mea surementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin

Subject: perfsonar development work

List archive

perfsonar: r4611 - in branches/geant2_java-sshtelnet-mp-RELEASE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/mea surementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin

From:
To:
Subject: perfsonar: r4611 - in branches/geant2_java-sshtelnet-mp-RELEASE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/mea surementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin
Date: Mon, 13 Oct 2008 10:31:12 -0400

Author: melis
Date: 2008-10-13 10:31:11 -0400 (Mon, 13 Oct 2008)
New Revision: 4611

Added:

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/requests/

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/requests/EchoRequest.xml

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/responses/

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_fail.gif

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_main.gif

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_return.gif

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_startbn.gif

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_succ.gif
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/index_sqlma.jsp
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/schema.rng
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/testdepl.jsp
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/tick.gif
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/wizard.properties

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/wizardproperties.dtd
branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.syslog.properties

branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.syslog.properties.template
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/changelog
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/conffiles
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/control
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/copyright
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/dirs
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/docs
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/files
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/install
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/postinst
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/postrm
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/rules
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/rpm/

branches/geant2_java-sshtelnet-mp-RELEASE/packaging/rpm/ps-mdm-sshtelnet-mp.specs

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml
branches/geant2_java-sshtelnet-mp-RELEASE/ant/configure-targets.xml
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml
branches/geant2_java-sshtelnet-mp-RELEASE/ant/webapp-package-targets.xml
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/Service_Admin.js

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties

branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/web.xml
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/default.css
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/Thumbs.db
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/index.jsp
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/main.css
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties
branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties
branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties.template
branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt

branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
branches/geant2_java-sshtelnet-mp-RELEASE/doc/Functionality Specification
for SSHTelnet 1.3.doc
branches/geant2_java-sshtelnet-mp-RELEASE/doc/Interface Specification for
SSHTelnet 1.3.doc
branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt

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

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

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

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

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java

branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
Log:
Updating RELEASE branch to version 1.3.4RC3

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml
2008-10-13 14:31:11 UTC (rev 4611)
@@ -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.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.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: branches/geant2_java-sshtelnet-mp-RELEASE/ant/configure-targets.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/configure-targets.xml
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/configure-targets.xml
2008-10-13 14:31:11 UTC (rev 4611)
@@ -79,11 +79,6 @@

<propertyfile file="${basedir}/conf/service.properties">

- <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
- <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
-
- <entry key="service.ls.registration_file"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/metadata.xml"/>
-

<entry key="service.r.service_type" value="mp"/>
<entry key="service.r.type" value="mp"/>

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=geant2-java-sshtelnet-mp
+service.name=ps-mdm-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3.3
+version=1.3.4RC3

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:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
2008-10-13 14:31:11 UTC (rev 4611)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=geant2-java-sshtelnet-mp
+service.name=ps-mdm-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3.3
+version=1.3.4RC3

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:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml
2008-10-13 14:31:11 UTC (rev 4611)
@@ -60,7 +60,7 @@
<artifact:dependencies>

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

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/ant/webapp-package-targets.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/webapp-package-targets.xml
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/webapp-package-targets.xml
2008-10-13 14:31:11 UTC (rev 4611)
@@ -48,11 +48,11 @@

<psbase:webapp-package-directory-init-phase-1 tmpdir="${tmpdir}"/>
<antcall target="webapp-package-directory-init-phase-2" />
- <psbase:webapp-package-directory-init-phase-3 tmpdir="${tmpdir}"
+ 


<antcall target="webapp-package-directory-extension-init-phase" />
@@ -60,13 +60,12 @@
</target>

-




- <target name="webapp-package-directory-init-phase-2">
+ <target name="webapp-package-directory-init-phase-2"
xmlns:psbase="psbase:/base.perfsonar.org">



@@ -76,7 +75,9 @@
<copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
<copy file="${basedir}/conf/log4j.properties.template"
- tofile="${basedir}/conf/log4j.properties"/>
+ tofile="${basedir}/conf/log4j.properties"/>
+ <copy file="${basedir}/conf/log4j.syslog.properties.template"
+ tofile="${basedir}/conf/log4j.syslog.properties"/>

<copy file="${basedir}/conf/servlet.properties.template"
tofile="${basedir}/conf/servlet.properties"/>

@@ -85,9 +86,9 @@
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"

todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"

+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"

todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"

+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.jar"

todir="${tmpdir}/WEB-INF/lib"/>
<copy file="${basedir}/lib/repository/remote/j2ssh-ant.jar"
todir="${tmpdir}/WEB-INF/lib"/>
@@ -109,6 +110,8 @@
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/log4j.properties"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="${basedir}/conf/log4j.syslog.properties"
+ todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/components.properties"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>

@@ -130,6 +133,41 @@

<mkdir dir="${tmpdir}/WEB-INF/classes/perfsonar/logs"/>

+ <sequential>
+ <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
+ <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
+
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+ token="__BASEPATH__"
+ value="/opt/perfsonar/services/{service.name}/WEB-INF" />
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ token="_LOGPATH_"
+ value="/opt/perfsonar/services/{service.name}/WEB-INF/logs"/>
+
+
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${tmpdir}/wsdd"/>
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${tmpdir}/wsdd"/>
+
+ <copy todir="${tmpdir}/WEB-INF/samples" failonerror="false">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/contrib" failonerror="false">
+ <fileset dir="${basedir}/contrib"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/doc" failonerror="false">
+ <fileset dir="${basedir}/doc"/>
+ </copy>
+
+ <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
+ todir="${tmpdir}/WEB-INF"
+ failonerror="false"/>
+
+ </sequential>
+
</target>

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/Service_Admin.js
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/Service_Admin.js
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/Service_Admin.js
2008-10-13 14:31:11 UTC (rev 4611)
@@ -31,7 +31,7 @@
reset_button.style.left = 83 + '%';
}
else {
- //alert("Not 768 "+x);
+ //alert("Not 768 "+x);
reset_button.style.top = 95 + '%';
reset_button.style.left = 67 + '%';
}
@@ -42,7 +42,7 @@
button.style.left = 91.5 + '%';
}
else {
- button.style.top = 95 + '%';
+ button.style.top = 95 + '%';
button.style.left = 74 + '%';
}
}
@@ -54,4 +54,75 @@
onscroll = FloatPosition;
onresize = FloatPosition;

+function checkStarFields(){

+ var divs = document.getElementsByTagName("div");
+ var filled = true;
+
+ for (var i = 0; i < divs.length; i++) {
+
+ var div = divs[i];
+ if (div.style.display == "block") {
+ var input_array = div.getElementsByTagName("input");
+
+ var text = document.createElement("td");
+ var ex = document.getElementById("extra");
+ if (ex != null) {
+ var p = ex.parentNode;
+ p.removeChild(ex);
+ }
+ text.id = "extra";
+ text.innerHTML = '<p style=\"color:red;\">Please fill in the
field!</p>';
+
+ for (var j = 0; j < input_array.length; j++) {
+
+ var input = input_array[j];
+
+ if (input.id == "required") {
+
+ var parent = input.parentNode.parentNode;
+ if (input.value == null || input.value == "" ||
input.value == " ") {
+ if
(parent.parentNode.parentNode.parentNode.style.display == "block") {
+ filled = false;
+ parent.appendChild(text);
+ return filled;
+ }
+
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ return filled;
+
+}
+
+function getDate(){
+
+ var date = document.getElementById("date");
+
+ var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
+
+ var stampmonths = new Array("January", "February", "March", "April",
"May", "June", "July", "August", "September", "October", "November",
"December");
+
+ var thedate = new Date();
+
+ date.innerHTML = stampdays[thedate.getDay()] + ", " +
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " +
thedate.getFullYear();
+
+}
+
+function highlight(el){
+ alert("Highlighted");
+ var links = document.getElementsByTagName("a");
+ for (var i = 0; i < links.length; i++) {
+
+ var link = links[i];
+
+ link.className
+ }
+}
+

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,147 +1,226 @@
-
## $Id$
## project : perfSONAR
## author: romradz

-# Group=Logger
-# Description=location of the log directory
-logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##

+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, psRootAppender

-#ROOT
-# Group=RootLogger
-# Description=The maximum backup index for the root logger
-log4j.appender.rootAppender.MaxBackupIndex=11
-# Group=RootLogger
-# Description=The file for the root logger
-log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
-# Group=RootLogger
-# Description=The class responsible for the layout of the root logger
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-# Group=RootLogger
-# Description=The conversion pattern for the root logger
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=RootLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.rootLogger=DEBUG, rootAppender
-# Group=RootLogger
-# Description=The maximum file size for the root logger
-#og4j.appender.rootAppender.MaxFileSize=500KB
-# Group=RootLogger
-# Description=The class responsible for appending text in the root logger
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, psRootAppender

-#DEBUG
-# Group=DebugLogger
-# Description=The maximum backup index for the debug logger
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# Description=Assigns fatal log messages to the specified log appender.
+log4j.logger.sonar-fatal=FATAL, psRootAppender
+
+
+
+##
+## Uncomment this block (and comment the one above)
+## if you want to have log levels in separate log files
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=DebugLogger
-# Description=The file for the debug logger
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
-# Group=DebugLogger
-# Description=The class responsible for the layout of the debug logger
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=DebugLogger
-# Description=The conversion pattern for the debug logger
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=DebugLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-debug=DEBUG, debugAppender
-# Group=DebugLogger
-# Description=The maximum file size for the debug logger
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Debug message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.debugAppender.MaxFileSize=500KB
-# Group=DebugLogger
-# Description=The class responsible for appending text in the debug logger
+
+# Group=Debug message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender

-#INFO
-# Group=InfoLogger
-# Description=The maximum backup index for the info logger
+
+
+######################################### INFO
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=InfoLogger
-# Description=The file for the info logger
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
-# Group=InfoLogger
-# Description=The class responsible for the layout of the info logger
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=InfoLogger
-# Description=The conversion pattern for the info logger
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=InfoLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-info=INFO, infoAppender
-# Group=InfoLogger
-# Description=The maximum file size for the info logger
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Info message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.infoAppender.MaxFileSize=500KB
-# Group=InfoLogger
-# Description=The class responsible for appending text in the info logger
+
+# Group=Info message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender

-#WARN
-# Group=WarnLogger
-# Description=The maximum backup index for the warning logger
+
+
+######################################### WARN
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=WarnLogger
-# Description=The file for the warning logger
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
-# Group=WarnLogger
-# Description=The class responsible for the layout of the warning logger
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=WarnLogger
-# Description=The conversion pattern for the warning logger
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=WarnLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-warn=WARN, warnAppender
-# Group=WarnLogger
-# Description=The maximum file size for the warning logger
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Warn message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.warnAppender.MaxFileSize=500KB
-# Group=WarnLogger
-# Description=The class responsible for appending text in the warning logger
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender

-#ERROR
-# Group=ErrorLogger
-# Description=The maximum backup index for the error logger
+
+
+######################################### ERROR
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=ErrorLogger
-# Description=The file for the error logger
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
-# Group=ErrorLogger
-# Description=The class responsible for the layout of the error logger
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=ErrorLogger
-# Description=The conversion pattern for the error logger
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=ErrorLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-error=ERROR, errorAppender
-# Group=ErrorLogger
-# Description=The maximum file size for the error logger
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Error message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.errorAppender.MaxFileSize=500KB
-# Group=ErrorLogger
-# Description=The class responsible for appending text in the error logger
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender

-#FATAL
-# Group=FatalLogger
-# Description=The maximum backup index for the fatal logger
+
+
+######################################### FATAL
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=FatalLogger
-# Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
-# Group=FatalLogger
-# Description=The class responsible for the layout of the fatal logger
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=FatalLogger
-# Description=The conversion pattern for the fatal logger
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=FatalLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-# Group=FatalLogger
-# Description=The maximum file size for the fatal logger
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Fatal message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.fatalAppender.MaxFileSize=500KB
-# Group=FatalLogger
-# Description=The class responsible for appending text in the fatal logger
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=All message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.psRootAppender.MaxFileSize=500KB
+
+# Group=All message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ROOT
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -5,27 +5,27 @@
#----------------

# Group=eXist
-# Description=The password for the admin account for eXist
+# Description=The administrator password for the eXist DB.
component.mp.xmldb.db_adminpassword=admin

# Group=eXist
-# Description=The username for eXist
+# Description=The username for the eXist DB.
component.mp.xmldb.db_username=sshtelnet

# Group=eXist
-# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be
uploaded in the eXist
component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml

#Group=eXist
# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+component.mp.xmldb.metadata_file_path=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=eXist
-# Description=The url of the eXist db
+# Description=The URL to the eXist DB.
component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db

# Group=eXist
-# Description=The password for the eXist database
+# Description=The user password for the eXist DB.
component.mp.xmldb.db_password=sshtelnet

# Group=eXist
@@ -36,8 +36,8 @@
#-------------------

# Group=Internal
-# Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
+service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties

# Group=Internal
# Description=The name of the class which is responsible for handling the
requests
@@ -45,10 +45,10 @@

# Group=Internal
# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/ps-mdm-sshtelnet-mp/objects.config

# Group=Internal
-# Description=Types of messages supported by this service
+# Description=A CSV of request message types supported by the service.
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

# Group=Internal
@@ -57,7 +57,7 @@

# Group=Internal
# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
-service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+service.mp.tokenPath=/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/

#LS properties
#-------------
@@ -84,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.3
+service.r.service_version=1.3.4RC3

# Group=LS
# Description=The e-mail address of the contact person for the service
@@ -96,7 +96,7 @@

# Group=LS
# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+component.registrator.interval=900000

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
@@ -104,7 +104,7 @@

# Group=LS
# Description=The name of the metadata configuration file which is to be
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+service.ls.registration_file=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=LS
# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,54 +1,30 @@
-#Changed at Wed Jan 30 11:12:44 CET 2008
-#Wed Jan 30 11:12:44 CET 2008
-
-# Group=eXist
-# Description=The name of the metadata configuration file to be uploaded to
the eXist
-component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
-
-# Group=eXist
-# Description=The path to the metadata configuration file to be uploaded to
the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=Servlet
-# Description=Type of service
-servlet.service_type=sshtelnetmp
-
-# Group=Servlet
-# Description=No idea really ;)
-servlets=
-
-# Group=eXist
-# Description=The username for the eXist database
-component.mp.xmldb.db_username=sshtelnet
-
-# Group=eXist
-# Description=the password for the eXist database
-component.mp.xmldb.db_password=sshtelnet
-
-# Group=Wizard
-# Description=The class for handling the wizard for the SSHTELNET MP
-servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler
-
-# Group=Servlet
-# Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
-servlet.exist_adminpass.property=component.mp.xmldb.db_adminpassword
-
-# Group=Servlet
-# Description=The admin password for the eXist database
-component.mp.xmldb.db_adminpassword=admin
-
-# Group=Servlet
-# Description=The username for the servlet
-servlet.username=perfsonaruser
-
-# Group=eXist
-# Description=The location of the eXist database
-component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
-
-# Group=Servlet
-# Description=The password for the servlet
-servlet.password=perfsonarpass
-
-# Group=Servlet
-# Description=The property in the service.properties file responsible for
holding the location of the eXist database
-servlet.exist_location.property=component.mp.xmldb.db_uri
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+# Group=Servlet
+# Description=Type of service
+servlet.service_type=sshtelnetmp
+
+# Group=Wizard
+# Description=The class for handling the wizard for the SSHTELNET MP
+servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler
+
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
+servlet.exist_adminpass.property=component.mp.xmldb.db_adminpassword
+
+# Group=Servlet
+# Description=The username for the servlet
+servlet.username=perfsonaruser
+
+# Group=Servlet
+# Description=The password for the servlet
+servlet.password=perfsonarpass
+
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the location of the eXist database
+servlet.exist_location.property=component.mp.xmldb.db_uri
+
+# Group=Servlet
+# Description=Controls the use of advanced features in the properties
management servlet. Default value is �off�
+servlet.extra_functionalities=off

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -21,10 +21,49 @@
<properties>
<comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>

+ <property>
+ <entry key="servlet.username" required="true">perfsonaruser</entry>
+ <Comment>Enter the username for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonaruser</ProposedValue>
+ <Group order="1" check="false">Administration</Group>
+ </property>
+
<property>
- <entry key="service.r.service_name"
required="true">geant2-java-sshtelnet-mp</entry>
+ <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
+ <Comment>Enter the password for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonarpass</ProposedValue>
+ <Group order="2">Administration</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.as.authn_active" required="true">no</entry>
+ <Comment>Do you wish to enable authentication?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="1" check="true">Authentication</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+
+ <property>
+ <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>Enter the URL address of the Authentication Service:</Comment>
+
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="2">Authentication</Group>
+ </property>
+
+ <property>
+ <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+ <Comment>Enter the message types which should be authenticated:</Comment>
+ <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+ <Group order="3">Authentication</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.r.service_name"
required="true">ps-mdm-sshtelnet-mp</entry>
<Comment>Enter the service name:</Comment>
- <ProposedValue>geant2-java-sshtelnet-mp</ProposedValue>
+ <ProposedValue>ps-mdm-sshtelnet-mp</ProposedValue>
<Group order="1">LS</Group>
</property>

@@ -44,7 +83,7 @@

<property>
<entry key="service.r.organization_name">Institution</entry>
- <Comment>Enter the name of the organization running this
service:</Comment>
+ <Comment>Enter the name of the organisation running this
service:</Comment>
<ProposedValue>Institution</ProposedValue>
<Group order="4">LS</Group>
</property>
@@ -57,9 +96,9 @@
</property>

<property>
- <entry key="component.registrator.interval">30000</entry>
+ <entry key="component.registrator.interval">900000</entry>
<Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>30000</ProposedValue>
+ <ProposedValue>900000</ProposedValue>
<Group order="6">LS</Group>
</property>

@@ -72,101 +111,92 @@


+ -->

<property>
- <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
- <Comment>Give the admin password for the eXist database</Comment>
- <ProposedValue />
- <Group order="7">eXist</Group>
+ <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc/db </entry>
+ <Comment>Enter the URI location of the eXist database:</Comment>
+ <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc/db
</ProposedValue>
+ <Group order="1">eXist</Group>
</property>

<property>
- <entry key="old_adminpassword" required="true"
password="true">admin</entry>
- <Comment>Give the old admin password for the eXist database</Comment>
- <ProposedValue>admin</ProposedValue>
- <Group order="6">eXist</Group>
+ <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
+ <Comment>Enter the service username for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
+ <Group order="2">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
- <Comment>Give the URI for the eXist database</Comment>
-
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
+ <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
+ <Comment>Enter the password for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
- <Comment>Give the username for the eXist database</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="4">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

<property>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
+ </property>
+
+ <property>
<entry key="component.mp.xmldb.metadata_file_name"
required="true">sshtelnetmetadata.xml</entry>
- <Comment>Give the name of the metadata configuration file</Comment>
+ <Comment>Enter the name of the metadata configuration file:</Comment>
<ProposedValue>sshtelnetmetadata.xml</ProposedValue>
- <Group order="1">eXist</Group>
+ <Group order="6">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.metadata_file_path"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
- <Comment>Give the path to the metadata configuration file (needed for
uploading the file into eXist)</Comment>
-
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
- <Group order="2">eXist</Group>
+ <entry key="component.mp.xmldb.metadata_file_path"
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
+ <Comment>Enter the full path of the metadata configuration
file:</Comment>
+
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
+ <Group order="7">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
- <Comment>Give the non-admin password for the eXist database (for the
user specified above)</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="5">eXist</Group>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="8" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

-
<property>
- <entry key="servlet.username" required="true">perfsonaruser</entry>
- <Comment>Give the username to use for logging in to the admin
pages</Comment>
- <ProposedValue>perfsonaruser</ProposedValue>
- <Group order="1" check="false">Administration</Group>
+ <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="8">eXist</Group>
</property>

<property>
- <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
- <Comment>Give the password to use for logging in to the admin
pages</Comment>
- <ProposedValue>perfsonarpass</ProposedValue>
- <Group order="2">Administration</Group>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="90" dependsOn="8">eXist</Group>
</property>

-
- <property>
- <entry key="service.as.authn_active" required="true">no</entry>
- <Comment>Do you wish to enable authentication?</Comment>
- <ProposedValue>yes</ProposedValue>
- <Group order="1" check="true">Authentication</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
-
<property>
- <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
- <Comment>Enter the URL address of the Authentication Service:</Comment>
-
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
- <Group order="2">Authentication</Group>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="8">eXist</Group>
</property>
-
- <property>
- <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
- <Comment>Enter the message types which should be authenticated:</Comment>
- <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
- <Group order="3">Authentication</Group>
- </property>
</properties>
-
-

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/requests/EchoRequest.xml

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/web.xml
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/web.xml
2008-10-13 14:31:11 UTC (rev 4611)
@@ -147,9 +147,10 @@
</mime-mapping>

<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.jsp</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>

+
</web-app>

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/default.css
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/default.css
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/default.css
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,3 +1,4 @@
+
/* standard elements */
html {
min-height: 100%;
@@ -13,7 +14,7 @@
font-family: arial;
}

-a img {
+a img{
border: none;
}
/* Wizard CSS */
@@ -50,6 +51,16 @@
margin-bottom: 20px;
}

+.inner_properties {
+ padding:0px;
+ margin:0px;
+}
+.inner_properties table{
+ border: none;
+ margin:0px;
+ padding:0px;
+}
+
.properties td {
padding: 15px;
font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -317,9 +328,6 @@
background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
}

-.collections_option_on a:visited, a:active {
- background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
-}

.collections_option_off a {
padding: 7px 80px 7px 80px;
@@ -329,33 +337,23 @@
background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
}

-.collections_option_off a:visited, a:active {
- background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
-}

-.users_option_on a {
+.users_option_off a{
padding: 7px 65px 7px 65px;
width: 210px;
height: 28px;
text-decoration: none;
- background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
+ background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
}

-users_option_on a:visited, a:active {
- background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
-}
-
-.users_option_off a {
+.users_option_on a {
padding: 7px 65px 7px 65px;
width: 210px;
height: 28px;
text-decoration: none;
- background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
+ background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
}

-users_option_off a:visited, a:active {
- background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
-}

.login_button {
width: 54px;
@@ -637,5 +635,167 @@
font-size: 13px;
}

+.test_table {
+ background-color: #99ff99;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+.test_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+/* Stitching Servlet*/
+
+#main_iface_panel{
+ margin-top: 2%;
+ margin-left:2%;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ height:100%
+
+}
+#main_iface_panel a{
+
+}
+
+#main_iface_panel a:visited a:active{
+
+}
+#iface_panel_body table{
+
+}
+#iface_panel_body td{
+ vertical-align:top;
+ height:100%;
+ padding:0px;
+}
+#file_management{
+ border: 1px solid blue;
+ padding:10px;
+ font-weight:bold;
+}
+
+#file_management table{
+ width:100%;
+}
+#file_info{
+ background-color:#BBBBE6;
+ padding:0px;
+}
+
+#file_info table{
+ width:100%;
+}
+#file_info th{
+
+ background-color:#8282C9;
+ color:#000000;
+ padding: 5px;
+ text-align:left;
+}
+#file_info_header{
+ color:white;
+ background-color:#8282C9;
+ font-weight:bold;
+}
+#file_info td{
+
+ padding: 5px;
+ text-align:left;
+}
+
+#iface_panel_header{
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 5px;
+ background-color: #E6E6FA;
+ margin:1px;
+
+}
+#panel_body_sidebar{
+
+ background-color: #CBCBED;
+}
+#panel_body_sidebar_devices{
+ height:100%;
+ background-color: #CBCBED;
+ float:left;
+ padding: 5px;
+ margin:1px;
+
+}
+
+#panel_body_sidebar table{
+ width:100%;
+ height:100%;
+}
+#panel_body_sidebar tr{
+ height:100%;
+}
+#panel_body_sidebar td{
+ padding: 8px;
+}
+
+#panel_body_sidebar a a:visited a:link{
+ padding: 0px;
+ margin:0px
+}
+
+#panel_body_ifaces{
+ background-color: #DEDEF9;
+ float:left;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom:20px;
+ padding-top:8px;
+ margin:0px;
+}
+#host_name{
+ font-size:15px;
+ font-weight:bold;
+}
+
+#ifaces_table{
+ margin-top: 15px;
+ background-color:#ECECFC;
+ width:100%;
+ border-spacing: 1px 0px;
+
+}
+
+#ifaces_table td{
+ padding: 5px;
+ border-top:none;
+}
+
+
+.ifaces_header1{
+ text-align:left;
+ font-weight:bold;
+ background-color:#8282C9;
+}
+.ifaces_header2{
+ background-color:#8282C9;
+ font-weight:bold;
+ text-align:center;
+}
+
+.execute_button_stitching {
+ display: block;
+ margin: 0px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/Thumbs.db
===================================================================
(Binary files differ)

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_fail.gif

Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_fail.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_main.gif

Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_main.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_return.gif

Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_return.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_startbn.gif

Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_startbn.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_succ.gif

Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/graphics/testdepl_succ.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/index.jsp
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/index.jsp
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/index.jsp
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,112 +1,150 @@
+<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
+
<html>
-<%@ page contentType="text/html; charset=utf-8" %>
-<%
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-%>
+ <head>
+ <title>perfSONAR Service Web Administration page</title>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+ <script src="Service_Admin.js"></script>

-<%@ include file="i18nLib.jsp" %>
+ <style type="text/css">
+ 
+ </style>
+ </head>
+ <body>
+ <%
+ java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
+ java.util.Date now= new java.util.Date();
+ java.util.Date date= dateFormat.parse(now.toString());
+ String confPath = "WEB-INF/classes/perfsonar/conf/";
+ String ServicePropertiesPath = confPath+ "service.properties";
+ ServletContext sc = getServletContext();
+ String ServicePath = sc.getRealPath("/");
+ PerfsonarProperty property = new PerfsonarProperty();
+ PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new FileInputStream(ServicePath
+ + ServicePropertiesPath));

-<%
- // initialize a private HttpServletRequest
- setRequest(request);
+ String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
+ String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
+

- // set a resouce base
- setResouceBase("i18n");
-%>
+ %>
+ <div class="adminPanel">
+ <div class="banner">
+ <table border="0" align="left" cellpadding="0"
cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ <td>
+ <table>
+ <tr><td
id="date"><%=date.toString()%></td></tr>
+ <tr><td id="serviceName"><%=serviceName %>
 <%=serviceVersion%></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th>
+ <a href="welcome.htm" class="button"
target="main">Admin home      </a>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">Basic
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ <br>
+ <a href="testdepl.jsp"
target="main">Test</a>
+ </p>
+ </td>
+ </tr>

-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Apache-Axis</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<%= getLocaleChoice() %>
-
-<%
- out.print(getMessage("welcomeMessage")+"<p/>");
- out.print(getMessage("operationType"));
-%>
-
-<ul>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("validationURL") +"\">");
- out.print(getMessage("validation") +"</a> - ");
- out.print(getMessage("validationFootnote00") +"<br>");
- out.print("<i>"+ getMessage("validationFootnote01") +"</i>");
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("serviceListURL") +"\">");
- out.print(getMessage("serviceList") +"</a> - ");
- out.print(getMessage("serviceListFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("callAnEndpointURL") +"\">");
- out.print(getMessage("callAnEndpoint") +"</a> - ");
- out.print(getMessage("callAnEndpointFootnote00") +" ");
- out.print(getMessage("callAnEndpointFootnote01"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("visitURL") +"\">");
- out.print(getMessage("visit") +"</a> - ");
- out.print(getMessage("visitFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("adminURL") +"\">");
- out.print(getMessage("admin") +"</a> - ");
- out.print(getMessage("adminFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("soapMonitorURL") +"\">");
- out.print(getMessage("soapMonitor") +"</a> - ");
- out.print(getMessage("soapMonitorFootnote"));
- %>
- </li>
-
-</ul>
-
-<%
- out.print(getMessage("sideNote") +"<p/>");
-%>
-
-<%
- out.print("<h3>"+ getMessage("validatingAxis") +"</h3>");
-
- out.print(getMessage("validationNote00") +"<p/>");
- out.print(getMessage("validationNote01"));
-%>
-</body>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading
style3">Advanced
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+ <br>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+ <br>
+ <a href="eXistAdmin"
target="main">eXist Database</a>
+ <br>
+
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ </tr>
+ </table>
+ <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
+ </div>
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
 
+ </div>
+ </div>
+ </body>
</html>

Added: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/index_sqlma.jsp

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/main.css
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/main.css
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/main.css
2008-10-13 14:31:11 UTC (rev 4611)
@@ -218,6 +218,25 @@
clip: rect(auto,auto,auto,auto);
float:left;
}
+#date{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+#serviceName{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight:bold;
+}
+
.mainWindow{
border: none;
padding: 0px;
@@ -354,4 +373,115 @@
border-left-color: #FFFFFF;
}

+.execute_button_testdepl {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_2_medium.gif) no-repeat
center;
+}

+.testdeplmain {
+ text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+/* font-weight:bold;;*/
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ border-width: 1px;
+ border-color: #61AF61;
+ padding: 5px;
+ width: 556px;
+ height:108px;
+ background: transparent url(graphics/testdepl_main.gif) no-repeat
center;
+}
+
+.testdeplsucc {
+ text-align: left;
+ float: left;
+ /*font-weight:bold;;*/
+ text-decoration: none;
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ width: 544px;
+ height: 220px;
+ background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
+}
+
+.testdeplfail {
+ text-align: left;
+ float: left;
+/* font-weight:bold;;*/
+ text-decoration: none;
+ padding: 5px;
+ margin-left: 2%;
+ /*margin-left: -20%;*/
+ height: 105px;
+ width:555px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ background: transparent url(graphics/testdepl_fail.gif) no-repeat
center;
+}
+
+.testdeplstartbn {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_startbn.gif) no-repeat
center;
+}
+
+.testdeplretbn {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: none;;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+.testdeplretbn2 {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+

Added: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/schema.rng

Added: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/testdepl.jsp

Added: branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/tick.gif

Property changes on:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/tick.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/wizard.properties

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/wizardproperties.dtd

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscoipv6commands.txt
2008-10-13 14:31:11 UTC (rev 4611)
@@ -2,7 +2,7 @@
IPv6_PROTOCOLS@@@show IPv6 protocols@@@0@@@0@@@cache@@@display detailed
information about IPv6 protocols currently configured on the
router@@@---@@@---
IPv6_ACCESS_LIST@@@show IPv6 access-lists@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 summary@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show bgp IPv6
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/ciscominimumpackage.txt
2008-10-13 14:31:11 UTC (rev 4611)
@@ -15,7 +15,7 @@
IP_MULTICAST_TRACEROUTE@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffic@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 summary@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[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})?$

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,147 +1,226 @@
-
## $Id$
## project : perfSONAR
## author: romradz

-# Group=Logger
-# Description=location of the log directory
-logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##

+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, psRootAppender

-#ROOT
-# Group=RootLogger
-# Description=The maximum backup index for the root logger
-log4j.appender.rootAppender.MaxBackupIndex=11
-# Group=RootLogger
-# Description=The file for the root logger
-log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
-# Group=RootLogger
-# Description=The class responsible for the layout of the root logger
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-# Group=RootLogger
-# Description=The conversion pattern for the root logger
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=RootLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.rootLogger=DEBUG, rootAppender
-# Group=RootLogger
-# Description=The maximum file size for the root logger
-#og4j.appender.rootAppender.MaxFileSize=500KB
-# Group=RootLogger
-# Description=The class responsible for appending text in the root logger
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, psRootAppender

-#DEBUG
-# Group=DebugLogger
-# Description=The maximum backup index for the debug logger
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# Description=Assigns fatal log messages to the specified log appender.
+log4j.logger.sonar-fatal=FATAL, psRootAppender
+
+
+
+##
+## Uncomment this block (and comment the one above)
+## if you want to have log levels in separate log files
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=DebugLogger
-# Description=The file for the debug logger
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
-# Group=DebugLogger
-# Description=The class responsible for the layout of the debug logger
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=DebugLogger
-# Description=The conversion pattern for the debug logger
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=DebugLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-debug=DEBUG, debugAppender
-# Group=DebugLogger
-# Description=The maximum file size for the debug logger
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Debug message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.debugAppender.MaxFileSize=500KB
-# Group=DebugLogger
-# Description=The class responsible for appending text in the debug logger
+
+# Group=Debug message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender

-#INFO
-# Group=InfoLogger
-# Description=The maximum backup index for the info logger
+
+
+######################################### INFO
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=InfoLogger
-# Description=The file for the info logger
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
-# Group=InfoLogger
-# Description=The class responsible for the layout of the info logger
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=InfoLogger
-# Description=The conversion pattern for the info logger
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=InfoLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-info=INFO, infoAppender
-# Group=InfoLogger
-# Description=The maximum file size for the info logger
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Info message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.infoAppender.MaxFileSize=500KB
-# Group=InfoLogger
-# Description=The class responsible for appending text in the info logger
+
+# Group=Info message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender

-#WARN
-# Group=WarnLogger
-# Description=The maximum backup index for the warning logger
+
+
+######################################### WARN
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=WarnLogger
-# Description=The file for the warning logger
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
-# Group=WarnLogger
-# Description=The class responsible for the layout of the warning logger
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=WarnLogger
-# Description=The conversion pattern for the warning logger
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=WarnLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-warn=WARN, warnAppender
-# Group=WarnLogger
-# Description=The maximum file size for the warning logger
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Warn message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.warnAppender.MaxFileSize=500KB
-# Group=WarnLogger
-# Description=The class responsible for appending text in the warning logger
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender

-#ERROR
-# Group=ErrorLogger
-# Description=The maximum backup index for the error logger
+
+
+######################################### ERROR
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=ErrorLogger
-# Description=The file for the error logger
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
-# Group=ErrorLogger
-# Description=The class responsible for the layout of the error logger
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=ErrorLogger
-# Description=The conversion pattern for the error logger
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=ErrorLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-error=ERROR, errorAppender
-# Group=ErrorLogger
-# Description=The maximum file size for the error logger
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Error message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.errorAppender.MaxFileSize=500KB
-# Group=ErrorLogger
-# Description=The class responsible for appending text in the error logger
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender

-#FATAL
-# Group=FatalLogger
-# Description=The maximum backup index for the fatal logger
+
+
+######################################### FATAL
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=FatalLogger
-# Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
-# Group=FatalLogger
-# Description=The class responsible for the layout of the fatal logger
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=FatalLogger
-# Description=The conversion pattern for the fatal logger
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=FatalLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-# Group=FatalLogger
-# Description=The maximum file size for the fatal logger
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Fatal message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.fatalAppender.MaxFileSize=500KB
-# Group=FatalLogger
-# Description=The class responsible for appending text in the fatal logger
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=All message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.psRootAppender.MaxFileSize=500KB
+
+# Group=All message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ROOT
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,147 +1,226 @@
-
## $Id$
## project : perfSONAR
## author: romradz

-# Group=Logger
-# Description=location of the log directory
-logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##

+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, psRootAppender

-#ROOT
-# Group=RootLogger
-# Description=The maximum backup index for the root logger
-log4j.appender.rootAppender.MaxBackupIndex=11
-# Group=RootLogger
-# Description=The file for the root logger
-log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
-# Group=RootLogger
-# Description=The class responsible for the layout of the root logger
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-# Group=RootLogger
-# Description=The conversion pattern for the root logger
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=RootLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.rootLogger=DEBUG, rootAppender
-# Group=RootLogger
-# Description=The maximum file size for the root logger
-#og4j.appender.rootAppender.MaxFileSize=500KB
-# Group=RootLogger
-# Description=The class responsible for appending text in the root logger
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, psRootAppender

-#DEBUG
-# Group=DebugLogger
-# Description=The maximum backup index for the debug logger
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# Description=Assigns fatal log messages to the specified log appender.
+log4j.logger.sonar-fatal=FATAL, psRootAppender
+
+
+
+##
+## Uncomment this block (and comment the one above)
+## if you want to have log levels in separate log files
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=DebugLogger
-# Description=The file for the debug logger
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
-# Group=DebugLogger
-# Description=The class responsible for the layout of the debug logger
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=DebugLogger
-# Description=The conversion pattern for the debug logger
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=DebugLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-debug=DEBUG, debugAppender
-# Group=DebugLogger
-# Description=The maximum file size for the debug logger
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Debug message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.debugAppender.MaxFileSize=500KB
-# Group=DebugLogger
-# Description=The class responsible for appending text in the debug logger
+
+# Group=Debug message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender

-#INFO
-# Group=InfoLogger
-# Description=The maximum backup index for the info logger
+
+
+######################################### INFO
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=InfoLogger
-# Description=The file for the info logger
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
-# Group=InfoLogger
-# Description=The class responsible for the layout of the info logger
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=InfoLogger
-# Description=The conversion pattern for the info logger
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=InfoLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-info=INFO, infoAppender
-# Group=InfoLogger
-# Description=The maximum file size for the info logger
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Info message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.infoAppender.MaxFileSize=500KB
-# Group=InfoLogger
-# Description=The class responsible for appending text in the info logger
+
+# Group=Info message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender

-#WARN
-# Group=WarnLogger
-# Description=The maximum backup index for the warning logger
+
+
+######################################### WARN
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=WarnLogger
-# Description=The file for the warning logger
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
-# Group=WarnLogger
-# Description=The class responsible for the layout of the warning logger
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=WarnLogger
-# Description=The conversion pattern for the warning logger
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=WarnLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-warn=WARN, warnAppender
-# Group=WarnLogger
-# Description=The maximum file size for the warning logger
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Warn message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.warnAppender.MaxFileSize=500KB
-# Group=WarnLogger
-# Description=The class responsible for appending text in the warning logger
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender

-#ERROR
-# Group=ErrorLogger
-# Description=The maximum backup index for the error logger
+
+
+######################################### ERROR
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=ErrorLogger
-# Description=The file for the error logger
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
-# Group=ErrorLogger
-# Description=The class responsible for the layout of the error logger
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=ErrorLogger
-# Description=The conversion pattern for the error logger
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=ErrorLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-error=ERROR, errorAppender
-# Group=ErrorLogger
-# Description=The maximum file size for the error logger
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Error message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.errorAppender.MaxFileSize=500KB
-# Group=ErrorLogger
-# Description=The class responsible for appending text in the error logger
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender

-#FATAL
-# Group=FatalLogger
-# Description=The maximum backup index for the fatal logger
+
+
+######################################### FATAL
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=FatalLogger
-# Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
-# Group=FatalLogger
-# Description=The class responsible for the layout of the fatal logger
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=FatalLogger
-# Description=The conversion pattern for the fatal logger
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=FatalLogger
-# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-# Group=FatalLogger
-# Description=The maximum file size for the fatal logger
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=Fatal message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
log4j.appender.fatalAppender.MaxFileSize=500KB
-# Group=FatalLogger
-# Description=The class responsible for appending text in the fatal logger
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# Group=All message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.psRootAppender.MaxFileSize=500KB
+
+# Group=All message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ROOT
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=/var/log/ps-mdm-sshtelnet-mp/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Added: branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.syslog.properties

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.syslog.properties.template

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -5,27 +5,27 @@
#----------------

# Group=eXist
-# Description=The password for the admin account for eXist
+# Description=The administrator password for the eXist DB.
component.mp.xmldb.db_adminpassword=admin

# Group=eXist
-# Description=The username for eXist
+# Description=The username for the eXist DB.
component.mp.xmldb.db_username=sshtelnet

# Group=eXist
-# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be
uploaded in the eXist
component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml

#Group=eXist
# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+component.mp.xmldb.metadata_file_path=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=eXist
-# Description=The url of the eXist db
+# Description=The URL to the eXist DB.
component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db

# Group=eXist
-# Description=The password for the eXist database
+# Description=The user password for the eXist DB.
component.mp.xmldb.db_password=sshtelnet

# Group=eXist
@@ -36,8 +36,8 @@
#-------------------

# Group=Internal
-# Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
+service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties

# Group=Internal
# Description=The name of the class which is responsible for handling the
requests
@@ -45,10 +45,10 @@

# Group=Internal
# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/ps-mdm-sshtelnet-mp/objects.config

# Group=Internal
-# Description=Types of messages supported by this service
+# Description=A CSV of request message types supported by the service.
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

# Group=Internal
@@ -57,7 +57,7 @@

# Group=Internal
# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
-service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+service.mp.tokenPath=/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/

#LS properties
#-------------
@@ -84,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.3
+service.r.service_version=1.3.4RC3

# Group=LS
# Description=The e-mail address of the contact person for the service
@@ -96,7 +96,7 @@

# Group=LS
# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+component.registrator.interval=900000

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
@@ -104,7 +104,7 @@

# Group=LS
# Description=The name of the metadata configuration file which is to be
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+service.ls.registration_file=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=LS
# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
2008-10-13 14:31:11 UTC (rev 4611)
@@ -5,27 +5,27 @@
#----------------

# Group=eXist
-# Description=The password for the admin account for eXist
+# Description=The administrator password for the eXist DB.
component.mp.xmldb.db_adminpassword=admin

# Group=eXist
-# Description=The username for eXist
+# Description=The username for the eXist DB.
component.mp.xmldb.db_username=sshtelnet

# Group=eXist
-# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be
uploaded in the eXist
component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml

#Group=eXist
# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+component.mp.xmldb.metadata_file_path=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=eXist
-# Description=The url of the eXist db
+# Description=The URL to the eXist DB.
component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db

# Group=eXist
-# Description=The password for the eXist database
+# Description=The user password for the eXist DB.
component.mp.xmldb.db_password=sshtelnet

# Group=eXist
@@ -36,8 +36,8 @@
#-------------------

# Group=Internal
-# Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
+service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties

# Group=Internal
# Description=The name of the class which is responsible for handling the
requests
@@ -45,10 +45,10 @@

# Group=Internal
# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/ps-mdm-sshtelnet-mp/objects.config

# Group=Internal
-# Description=Types of messages supported by this service
+# Description=A CSV of request message types supported by the service.
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

# Group=Internal
@@ -57,7 +57,7 @@

# Group=Internal
# Description=The path where the temporary token files will be stored (be
sure to make the path writable!)
-service.mp.tokenPath=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/
+service.mp.tokenPath=/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/

#LS properties
#-------------
@@ -84,7 +84,7 @@

# Group=LS
# Description=The version of the service
-service.r.service_version=1.3.3
+service.r.service_version=1.3.4RC3

# Group=LS
# Description=The e-mail address of the contact person for the service
@@ -96,7 +96,7 @@

# Group=LS
# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+component.registrator.interval=900000

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
@@ -104,7 +104,7 @@

# Group=LS
# Description=The name of the metadata configuration file which is to be
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+service.ls.registration_file=/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml

# Group=LS
# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,54 +1,30 @@
-#Changed at Wed Jan 30 11:12:44 CET 2008
-#Wed Jan 30 11:12:44 CET 2008
-
-# Group=eXist
-# Description=The name of the metadata configuration file to be uploaded to
the eXist
-component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
-
-# Group=eXist
-# Description=The path to the metadata configuration file to be uploaded to
the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=Servlet
-# Description=Type of service
-servlet.service_type=sshtelnetmp
-
-# Group=Servlet
-# Description=No idea really ;)
-servlets=
-
-# Group=eXist
-# Description=The username for the eXist database
-component.mp.xmldb.db_username=sshtelnet
-
-# Group=eXist
-# Description=the password for the eXist database
-component.mp.xmldb.db_password=sshtelnet
-
-# Group=Wizard
-# Description=The class for handling the wizard for the SSHTELNET MP
-servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler
-
-# Group=Servlet
-# Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
-servlet.exist_adminpass.property=component.mp.xmldb.db_adminpassword
-
-# Group=Servlet
-# Description=The admin password for the eXist database
-component.mp.xmldb.db_adminpassword=admin
-
-# Group=Servlet
-# Description=The username for the servlet
-servlet.username=perfsonaruser
-
-# Group=eXist
-# Description=The location of the eXist database
-component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
-
-# Group=Servlet
-# Description=The password for the servlet
-servlet.password=perfsonarpass
-
-# Group=Servlet
-# Description=The property in the service.properties file responsible for
holding the location of the eXist database
-servlet.exist_location.property=component.mp.xmldb.db_uri
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+# Group=Servlet
+# Description=Type of service
+servlet.service_type=sshtelnetmp
+
+# Group=Wizard
+# Description=The class for handling the wizard for the SSHTELNET MP
+servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler
+
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
+servlet.exist_adminpass.property=component.mp.xmldb.db_adminpassword
+
+# Group=Servlet
+# Description=The username for the servlet
+servlet.username=perfsonaruser
+
+# Group=Servlet
+# Description=The password for the servlet
+servlet.password=perfsonarpass
+
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the location of the eXist database
+servlet.exist_location.property=component.mp.xmldb.db_uri
+
+# Group=Servlet
+# Description=Controls the use of advanced features in the properties
management servlet. Default value is �off�
+servlet.extra_functionalities=off

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties.template
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties.template
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/servlet.properties.template
2008-10-13 14:31:11 UTC (rev 4611)
@@ -1,30 +1,10 @@
#Changed at Wed Jan 30 11:12:44 CET 2008
#Wed Jan 30 11:12:44 CET 2008

-# Group=eXist
-# Description=The name of the metadata configuration file to be uploaded to
the eXist
-component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
-
-# Group=eXist
-# Description=The path to the metadata configuration file to be uploaded to
the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
# Group=Servlet
# Description=Type of service
servlet.service_type=sshtelnetmp

-# Group=Servlet
-# Description=No idea really ;)
-servlets=
-
-# Group=eXist
-# Description=The username for the eXist database
-component.mp.xmldb.db_username=sshtelnet
-
-# Group=eXist
-# Description=the password for the eXist database
-component.mp.xmldb.db_password=sshtelnet
-
# Group=Wizard
# Description=The class for handling the wizard for the SSHTELNET MP

servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler
@@ -37,10 +17,6 @@
# Description=The username for the servlet
servlet.username=perfsonaruser

-# Group=eXist
-# Description=The location of the eXist database
-component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
-
# Group=Servlet
# Description=The password for the servlet
servlet.password=perfsonarpass
@@ -48,3 +24,7 @@
# Group=Servlet
# Description=The property in the service.properties file responsible for
holding the location of the eXist database
servlet.exist_location.property=component.mp.xmldb.db_uri
+
+# Group=Servlet
+# Description=Controls the use of advanced features in the properties
management servlet. Default value is �off�
+servlet.extra_functionalities=off

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties
2008-10-13 14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties
2008-10-13 14:31:11 UTC (rev 4611)
@@ -21,10 +21,49 @@
<properties>
<comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>

+ <property>
+ <entry key="servlet.username" required="true">perfsonaruser</entry>
+ <Comment>Enter the username for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonaruser</ProposedValue>
+ <Group order="1" check="false">Administration</Group>
+ </property>
+
<property>
- <entry key="service.r.service_name"
required="true">geant2-java-sshtelnet-mp</entry>
+ <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
+ <Comment>Enter the password for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonarpass</ProposedValue>
+ <Group order="2">Administration</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.as.authn_active" required="true">no</entry>
+ <Comment>Do you wish to enable authentication?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="1" check="true">Authentication</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+
+ <property>
+ <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>Enter the URL address of the Authentication Service:</Comment>
+
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="2">Authentication</Group>
+ </property>
+
+ <property>
+ <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+ <Comment>Enter the message types which should be authenticated:</Comment>
+ <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+ <Group order="3">Authentication</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.r.service_name"
required="true">ps-mdm-sshtelnet-mp</entry>
<Comment>Enter the service name:</Comment>
- <ProposedValue>geant2-java-sshtelnet-mp</ProposedValue>
+ <ProposedValue>ps-mdm-sshtelnet-mp</ProposedValue>
<Group order="1">LS</Group>
</property>

@@ -44,7 +83,7 @@

<property>
<entry key="service.r.organization_name">Institution</entry>
- <Comment>Enter the name of the organization running this
service:</Comment>
+ <Comment>Enter the name of the organisation running this
service:</Comment>
<ProposedValue>Institution</ProposedValue>
<Group order="4">LS</Group>
</property>
@@ -57,9 +96,9 @@
</property>

<property>
- <entry key="component.registrator.interval">30000</entry>
+ <entry key="component.registrator.interval">900000</entry>
<Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>30000</ProposedValue>
+ <ProposedValue>900000</ProposedValue>
<Group order="6">LS</Group>
</property>

@@ -72,101 +111,92 @@


+ -->

<property>
- <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
- <Comment>Give the admin password for the eXist database</Comment>
- <ProposedValue />
- <Group order="7">eXist</Group>
+ <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc/db </entry>
+ <Comment>Enter the URI location of the eXist database:</Comment>
+ <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc/db
</ProposedValue>
+ <Group order="1">eXist</Group>
</property>

<property>
- <entry key="old_adminpassword" required="true"
password="true">admin</entry>
- <Comment>Give the old admin password for the eXist database</Comment>
- <ProposedValue>admin</ProposedValue>
- <Group order="6">eXist</Group>
+ <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
+ <Comment>Enter the service username for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
+ <Group order="2">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
- <Comment>Give the URI for the eXist database</Comment>
-
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
+ <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
+ <Comment>Enter the password for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
- <Comment>Give the username for the eXist database</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="4">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

<property>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
+ </property>
+
+ <property>
<entry key="component.mp.xmldb.metadata_file_name"
required="true">sshtelnetmetadata.xml</entry>
- <Comment>Give the name of the metadata configuration file</Comment>
+ <Comment>Enter the name of the metadata configuration file:</Comment>
<ProposedValue>sshtelnetmetadata.xml</ProposedValue>
- <Group order="1">eXist</Group>
+ <Group order="6">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.metadata_file_path"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
- <Comment>Give the path to the metadata configuration file (needed for
uploading the file into eXist)</Comment>
-
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
- <Group order="2">eXist</Group>
+ <entry key="component.mp.xmldb.metadata_file_path"
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
+ <Comment>Enter the full path of the metadata configuration
file:</Comment>
+
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
+ <Group order="7">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
- <Comment>Give the non-admin password for the eXist database (for the
user specified above)</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="5">eXist</Group>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="8" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

-
<property>
- <entry key="servlet.username" required="true">perfsonaruser</entry>
- <Comment>Give the username to use for logging in to the admin
pages</Comment>
- <ProposedValue>perfsonaruser</ProposedValue>
- <Group order="1" check="false">Administration</Group>
+ <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="8">eXist</Group>
</property>

<property>
- <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
- <Comment>Give the password to use for logging in to the admin
pages</Comment>
- <ProposedValue>perfsonarpass</ProposedValue>
- <Group order="2">Administration</Group>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="90" dependsOn="8">eXist</Group>
</property>

-
- <property>
- <entry key="service.as.authn_active" required="true">no</entry>
- <Comment>Do you wish to enable authentication?</Comment>
- <ProposedValue>yes</ProposedValue>
- <Group order="1" check="true">Authentication</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
-
<property>
- <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
- <Comment>Enter the URL address of the Authentication Service:</Comment>
-
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
- <Group order="2">Authentication</Group>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="8">eXist</Group>
</property>
-
- <property>
- <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
- <Comment>Enter the message types which should be authenticated:</Comment>
- <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
- <Group order="3">Authentication</Group>
- </property>
</properties>
-
-

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
2008-10-13 14:31:11 UTC (rev 4611)
@@ -2,7 +2,7 @@
IPv6_PROTOCOLS@@@show IPv6 protocols@@@0@@@0@@@cache@@@display detailed
information about IPv6 protocols currently configured on the
router@@@---@@@---
IPv6_ACCESS_LIST@@@show IPv6 access-lists@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 summray@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show bgp IPv6
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
2008-10-13 14:31:11 UTC (rev 4611)
@@ -15,7 +15,7 @@
IP_MULTICAST_TRACEROUTE@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffic@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 summary@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[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})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
2008-10-13 14:31:11 UTC (rev 4611)
@@ -2,7 +2,7 @@
IPv6_PROTOCOLS@@@show IPv6 protocols@@@0@@@0@@@cache@@@display detailed
information about IPv6 protocols currently configured on the
router@@@---@@@---
IPv6_ACCESS_LIST@@@show IPv6 access-lists@@@0@@@0@@@cache@@@display IPv6
access lists@@@---@@@---
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 summary@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_DAMPENED_PATHS@@@show bgp IPv6
dampened-paths@@@0@@@0@@@cache@@@show all dampened BGP paths@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
2008-10-13 14:31:11 UTC (rev 4611)
@@ -15,7 +15,7 @@
IP_MULTICAST_TRACEROUTE@@@mtrace@@@1@@@1@@@cache@@@trace the path of a
packet from the specified source interface to the receivers of the multicast
traffic@@@<ip
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
IPv6_INTERFACE_ADDRESS@@@show IPv6 interface brief@@@0@@@0@@@cache@@@display
interface IPv6 addresses@@@---@@@---
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
-IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 summary@@@0@@@0@@@cache@@@display the
status of all current IPv6 BGP connections@@@---@@@---
IPv6_BGP_NEIGHBOUR_ADVERTISED@@@show bgp IPv6 unicast
neighors@@@1@@@1@@@cache@@@show advertised prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_BGP_NEIGHBOUR_RECEIVED@@@show bgp IPv6 unicast
neighbors@@@1@@@1@@@cache@@@show received prefixes from <IPv6
address>@@@<peer IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[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})?$

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/doc/Functionality
Specification for SSHTelnet 1.3.doc
===================================================================
(Binary files differ)

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

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt 2008-10-13
14:26:38 UTC (rev 4610)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt 2008-10-13
14:31:11 UTC (rev 4611)
@@ -1,20 +1,27 @@
Change log
----------

-1.3.3 - 18/06/2008
+1.3.4RC1 - xx/xx/2008

+ * ps-base version: 1.0.20080902
+ * web-admin version: 0.9.3b
+ * added selftest and syslogging
+ * updated webadmin
+
+1.3.3 - 18/06/2008
+
* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
* fixed the design flaw which was related to the command parameters (had to
update the list of commands for this)
* added a parameter to the service.properties file, which defines a
directory to put the temporary token files

-1.3.2 - 06/06/2008
+1.3.2 - 06/06/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
* fixed the bug which prevented the SSHTELNET MP from registering to the LS

-1.3.1 - 28/05/2008
+1.3.1 - 28/05/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
@@ -23,28 +30,28 @@
* removed some unnecessary logging entries in some classes (too much
printlns
which don't really add anything useful)

-1.3 - 05/05/2008
+1.3 - 05/05/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8.3b
* fixed the bug which prevented the MP from connecting to the eXist database
* fixed the bug which removed the groups in the webadmin once it was used
once

-1.3RC4 - 27/03/2008
+1.3RC4 - 27/03/2008

* ps-base version: 1.0.20080310
* web-admin version: 0.8b
* no further fixes

-1.3RC3 - 06/03/2008
+1.3RC3 - 06/03/2008

* fixed timeout bug in the telnet side of the SSHTELNET MP

-1.3RC2 - 03/03/2008
+1.3RC2 - 03/03/2008

* fixed bug in the service.properties file

-1.3RC1 - 06/02/2008
+1.3RC1 - 06/02/2008

* added Authentication
* changed eventTypes to be URL based

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/changelog

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/conffiles

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/control

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/copyright

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/dirs

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/docs

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/files

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/install

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/postinst

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/postrm

Added: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/rules

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/rpm/ps-mdm-sshtelnet-mp.specs

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -206,15 +206,6 @@
} else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}

- logger.debug("[CiscoKeyBgpAdapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- //manager.connect(username, keyUrl);
- //} else {
- //manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.debug("[CiscoKeyBgpAdapter][connect] Logged in");
-
} catch (Exception e) {

logger.error("[CiscoKeyBgpAdapter][Connect] Error occuring while
connecting");

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -202,15 +202,9 @@

}

- logger.info("[CiscoSshBgpAdapter][connect] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[CiscoSshBgpAdapter][connect] Logged in");
-
} catch (Exception e) {

- logger.error("[CiscoSshBgpAdapter] Error occuring while
connecting");
+ logger.error("[CiscoSshBgpAdapter][connect] Error occuring while
connecting");
logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");
@@ -278,7 +272,6 @@

BgpCommand command = new BgpCommand(token,
properties.getProperty(subject, token, "command"));
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperBgpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -215,7 +215,7 @@

} catch (Exception e) {

- logger.error("[JuniperBgpAdapter] Error occuring while
connecting");
+ logger.error("[JuniperBgpAdapter][connect] Error occuring while
connecting");
logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");
@@ -283,7 +283,6 @@

BgpCommand command = new BgpCommand(token,
properties.getProperty(subject, token, "command"));
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
@@ -427,7 +426,7 @@

}

- logger.debug("[JuniperBgpAdapter] TelnetManager created: " + url + "
" + port);
+ logger.debug("[JuniperBgpAdapter][takeAction] TelnetManager created:
" + url + " " + port);

try {

@@ -441,7 +440,7 @@

}

- logger.debug("[JuniperBgpAdapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[JuniperBgpAdapter][takeAction] Prompt set in
TelnetManager: " + prompt);

// This private method call will include all supported methods
// that can be performed on the remote device

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -83,13 +83,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYBGPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyBgpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperKeyBgpAdapter] Constructor finished");
+ logger.info("[JuniperKeyBgpAdapter] Constructor finished");

}// JuniperKeyBgpAdapter

@@ -99,7 +99,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperKeyBgpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperKeyBgpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -109,7 +109,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperKeyBgpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyBgpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -119,7 +119,7 @@
*/
public void addAvailableSpecificCommand(BgpCommandInterface command) {

- logger.debug("[JuniperKeyBgpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyBgpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -130,7 +130,7 @@
public BgpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperKeyBgpAdapter] getCommand called");
+ logger.info("[JuniperKeyBgpAdapter] getCommand called");

BgpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -141,7 +141,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperKeyBgpAdapter] Command found");
+ logger.debug("[JuniperKeyBgpAdapter][getCommand] Command
found: " + command);
return command;

}
@@ -158,11 +158,10 @@
*/
public BgpCommandInterface executeCommand(BgpCommandInterface command) {

- logger.debug("[JuniperKeyBgpAdapter] executeCommand called");
+ logger.info("[JuniperKeyBgpAdapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());

command.setResult(temp2);
@@ -170,9 +169,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperKeyBgpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[JuniperKeyBgpAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -205,19 +204,10 @@

}

- logger.info("[JuniperKeyBgpAdapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- //manager.connect(username, keyUrl);
- //} else {
- //manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.info("[JuniperKeyBgpAdapter] Login");
-
} catch (Exception e) {

- logger.error("[JuniperKeyBgpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperKeyBgpAdapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");
}
@@ -286,13 +276,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyBgpAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyBgpAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -304,7 +294,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYBGPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyBgpAdapter][ConfigureCommands] Unable
to retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -392,14 +382,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperKeyBgpAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperKeyBgpAdapter][takeAction] EventTypeString: "
+ eventTypeString);

//JuniperKeyBgpAdapter adapter = new JuniperKeyBgpAdapter();

@@ -419,20 +409,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERKEYBGPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyBgpAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERKEYBGPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyBgpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[JuniperKeyBgpAdapter] TelnetManager created: " + url
+ " " + port);
+ logger.debug("[JuniperKeyBgpAdapter][takeAction] SshKeyManager
created: " + url + " " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -450,7 +441,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperKeyBgpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -474,12 +465,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyBgpAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyBgpAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -510,12 +501,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -537,7 +528,7 @@

}

- logger.info("[JuniperKeyBgpAdapter] Command executed succesfully");
+ logger.info("[JuniperKeyBgpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();

@@ -547,7 +538,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperKeyBgpAdapter] Constructing response message");
+ logger.info("[JuniperKeyBgpAdapter][takeAction] Constructing
response message");

Message response = new Message();

@@ -560,7 +551,7 @@
response.setMetadata(respMetaData[0]);
response.setData(respData[0]);

- logger.info("[JuniperKeyBgpAdapter] takeAction finished");
+ logger.info("[JuniperKeyBgpAdapter][takeAction] takeAction
finished");

return response;

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -76,7 +76,6 @@

this.properties = new DbMetadataConfiguration();
properties.initStorage();
-
this.serviceEngineType =
"service.MeasurementPoint.TELNETSSHType";

//FOR LOCAL TESTING
@@ -84,14 +83,12 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHBGPADAPTER][Constructor]" +
e.getStackTrace().toString());
- throw new PerfSONARException("error.mp.sshYE.configuration",
+ logger.error("[JuniperSshBgpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
+ throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperSshBgpAdapter] Constructor started");
-
logger.debug("[JuniperSshBgpAdapter] Constructor finished");

}// JuniperSshBgpAdapter
@@ -102,7 +99,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperSshBgpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperSshBgpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -112,7 +109,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperSshBgpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperSshBgpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -122,7 +119,7 @@
*/
public void addAvailableSpecificCommand(BgpCommandInterface command) {

- logger.debug("[JuniperSshBgpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperSshBgpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -133,7 +130,7 @@
public BgpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperSshBgpAdapter] getCommand called");
+ logger.info("[JuniperSshBgpAdapter] getCommand called");

BgpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -144,7 +141,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperSshBgpAdapter] Command found");
+ logger.info("[JuniperSshBgpAdapter] Command found: " +
command);
return command;

}
@@ -161,7 +158,7 @@
*/
public BgpCommandInterface executeCommand(BgpCommandInterface command) {

- logger.debug("[JuniperSshBgpAdapter] executeCommand called");
+ logger.info("[JuniperSshBgpAdapter] executeCommand called");

if (manager != null) {

@@ -171,7 +168,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperSshBgpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[JuniperSshBgpAdapter] executeCommand finished");
return command;
@@ -206,16 +203,10 @@

}

- logger.info("[JuniperSshBgpAdapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[JuniperSshBgpAdapter Login");
-
} catch (Exception e) {

- logger.error("[JuniperSshBgpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperSshBgpAdapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -282,17 +273,16 @@

BgpCommand command = new BgpCommand(token,
properties.getProperty(subject, token, "command"));
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshBgpAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHBGPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshBgpAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -304,7 +294,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHBGPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshBgpAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -392,14 +382,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperSshBgpAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperKeyBgpAdapter][takeAction] EventTypeString: "
+ eventTypeString);

//JuniperSshBgpAdapter adapter = new JuniperSshBgpAdapter();

@@ -421,20 +411,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERSSHBGPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshBgpAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERSSHBGPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshBgpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] SshManager created: " + url + " "
+ port);
+ logger.debug("[JuniperSshBgpAdapter][takeAction] SshManager created:
" + url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -454,7 +445,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperSshBgpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -478,12 +469,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshBgpAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshBgpAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -513,12 +504,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(bgpCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(bgpCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(bgpCommand.getDeviceName()) &&
cachedCommand.getTimestamp() + (caching * 1000) > System.currentTimeMillis())
{

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshBgpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshBgpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -540,7 +531,7 @@

}

- logger.info("[JuniperSshBgpAdapter] Command executed succesfully");
+ logger.info("[JuniperSshBgpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -549,7 +540,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperSshBgpAdapter] Constructing response message");
+ logger.info("[JuniperSshBgpAdapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption/PasswordEncryptor.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -18,6 +18,7 @@
import javax.crypto.spec.DESKeySpec;

import org.apache.ws.security.util.Base64;
+import org.perfsonar.base.exceptions.PerfSONARException;

@@ -37,7 +38,7 @@
* @return String encryptedPassword
*/

- public static String encryptPassword(String pass) {
+ public static String encryptPassword(String pass) throws
PerfSONARException{

String result = "";

@@ -68,27 +69,25 @@

ciphertext = desCipher.doFinal(cleartext);

- System.out.println("CipherText: " + ciphertext);
-
return Base64.encode(ciphertext);

//System.out.println("result.length()" + result.length());
} catch (InvalidKeyException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (InvalidKeySpecException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (NoSuchPaddingException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (IllegalBlockSizeException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (BadPaddingException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (Exception e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
}
- return result;
+
}

@@ -99,7 +98,7 @@
* @return String plain-text password
*/

- public static String decryptPassword(String pass) {
+ public static String decryptPassword(String pass) throws
PerfSONARException{
String result = "";

try {
@@ -132,31 +131,28 @@
byte[] cleartext1 = desCipher.doFinal(encrypted);

result = new String(cleartext1, "ISO-8859-1");
+
+ return result;
} catch (InvalidKeyException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (InvalidKeySpecException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (NoSuchPaddingException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (IllegalBlockSizeException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (BadPaddingException e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
} catch (Exception e) {
- e.printStackTrace();
+ throw new PerfSONARException(e.getMessage());
}

- return result;
}

public static void main (String[] args) {
- //String encrypt = encryptPassword(args[0]);
- //System.out.println("Encrypted Password : " + encrypt);
-
- //System.out.println("Decrypted string: " + decryptPassword(encrypt));
- System.out.println("Decrypted string: " + decryptPassword(args[0]));
+
}

}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -79,7 +79,7 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOADAPTER][Constructor]" +
e.getStackTrace()[0].toString());
+ logger.error("[CiscoAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
}
@@ -109,7 +109,7 @@
EndPoint endpoint = (EndPoint) subject.getChildArray()[0];
String subjectString = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subjectString);
+ logger.debug("[CiscoAdapted][takeAction] subjectString: " +
subjectString);

EventType eventType = null;
String eventTypeString = "";
@@ -119,12 +119,12 @@
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

} catch (Exception e) {
- logger.error("[CISCOADAPTER][TakeAction]" +
e.getStackTrace()[0].toString());
+ logger.error("[CiscoAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.command",
"No Command/EventType specified in request");
}

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoAdapted][takeAction] eventTypeString: " +
eventTypeString);

long last = 0;

@@ -132,7 +132,7 @@
try {
rate = properties.getProperty(subjectString, "rate");
} catch (PerfSONARException e2) {
- logger.error("[CISCOADAPTER][TakeAction]" +
e2.getStackTrace()[0].toString());
+ logger.error("[CiscoAdapter][TakeAction]" +
e2.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
}
@@ -161,18 +161,18 @@
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e1) {
- logger.error("[CISCOADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve token for request");
} catch (IOException e1) {
- logger.error("[CISCOADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve token for request");
}

//e.printStackTrace();
} catch (IOException e) {
- logger.error("[CISCOADAPTER][TakeAction]" +
e.getStackTrace()[0].toString());
+ logger.error("[CiscoAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
}

if (System.currentTimeMillis() - last > rateLong) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoKeyAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -79,7 +79,7 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOKEYADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
}
@@ -109,7 +109,7 @@
EndPoint endpoint = (EndPoint) subject.getChildArray()[0];
String subjectString = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subjectString);
+ logger.debug("[CiscoKeyAdapted][takeAction] subjectString: " +
subjectString);

EventType eventType = null;
String eventTypeString = "";
@@ -119,19 +119,19 @@
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

} catch (Exception e) {
- logger.error("[CISCOKEYADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.command",
"No Command/EventType specified in request");
}

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoAdapted][takeAction] eventTypeString: " +
eventTypeString);
long last = 0;

String rate;
try {
rate = properties.getProperty(subjectString, "rate");
} catch (PerfSONARException e2) {
- logger.error("[CISCOKEYADAPTER][TakeAction]" +
e2.getStackTrace().toString());
+ logger.error("[CiscoKeyAdapter][TakeAction]" +
e2.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
}
@@ -160,18 +160,18 @@
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e1) {
- logger.error("[CISCOKEYADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve token for request");
} catch (IOException e1) {
- logger.error("[CISCOKEYADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve token for request");
}

//e.printStackTrace();
} catch (IOException e) {
- logger.error("[CISCOKEYADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
}

if (System.currentTimeMillis() - last > rateLong) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/CiscoSshAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -98,7 +98,7 @@

} catch (PerfSONARException e) {

-
logger.error("[CISCOSSHADAPTER][Constructor]"+e.getStackTrace().toString());
+
logger.error("[CiscoSshAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");
}
@@ -130,7 +130,7 @@
EndPoint endpoint = (EndPoint) subject.getChildArray()[0];
String subjectString = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subjectString);
+ logger.debug("[CiscoSshAdapted][takeAction] subjectString: "
+ subjectString);

EventType eventType = null;
String eventTypeString = "";
@@ -140,20 +140,20 @@
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

} catch (Exception e) {
-
logger.error("[CISCOSSHADAPTER][TakeAcion]"+e.getStackTrace().toString());
+
logger.error("[CiscoSshAdapter][TakeAcion]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.command",
"No Command/EventType specified in
request");
}

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

+ logger.debug("[CiscoSshAdapted][takeAction] eventTypeString:
" + eventTypeString);
long last = 0;

String rate;
try {
rate = properties.getProperty(subjectString, "rate");
} catch (PerfSONARException e2) {
-
logger.error("[CISCOSSHADAPTER][TakeAcion]"+e2.getStackTrace().toString());
+
logger.error("[CiscoSshAdapter][TakeAcion]"+e2.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");
}
@@ -184,18 +184,18 @@
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e1) {
-
logger.error("[CISCOSSHADAPTER][TakeAcion]"+e1.getStackTrace().toString());
+
logger.error("[CiscoSshAdapter][TakeAcion]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve
token for request");
} catch (IOException e1) {
-
logger.error("[CISCOSSHADAPTER][TakeAcion]"+e1.getStackTrace().toString());
+
logger.error("[CiscoSshAdapter][TakeAcion]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve
token for request");
}

//e.printStackTrace();
} catch (IOException e) {
-
logger.error("[CISCOSSHADAPTER][TakeAcion]"+e.getStackTrace().toString());
+
logger.error("[CiscoSshAdapter][TakeAcion]"+e.getStackTrace()[0].toString());
}

if (System.currentTimeMillis() - last > rateLong) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -79,7 +79,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
}
@@ -109,7 +109,7 @@
EndPoint endpoint = (EndPoint) subject.getChildArray()[0];
String subjectString = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subjectString);
+ logger.debug("[JuniperAdapted][takeAction] subjectString: " +
subjectString);

EventType eventType = null;
String eventTypeString = "";
@@ -119,20 +119,20 @@
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

} catch (Exception e) {
- logger.error("[JUNIPERADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[JuniperAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.command",
"No Command/EventType specified in request");
}

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperAdapted][takeAction] eventTypeString: " +
eventTypeString);
long last = 0;

String rate;
try {
rate = properties.getProperty(subjectString, "rate");
} catch (PerfSONARException e2) {
- logger.error("[JUNIPERADAPTER][TakeAction]" +
e2.getStackTrace().toString());
+ logger.error("[JuniperAdapter][TakeAction]" +
e2.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
}
@@ -161,18 +161,18 @@
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e1) {
- logger.error("[JUNIPERADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve token for request");
} catch (IOException e1) {
- logger.error("[JUNIPERADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve token for request");
}

//e.printStackTrace();
} catch (IOException e) {
- logger.error("[JUNIPERADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[JuniperAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
}

if (System.currentTimeMillis() - last > rateLong) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperKeyAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -88,7 +88,7 @@

} catch (PerfSONARException e) {

-
logger.error("[JUNIPERKEYADAPTER][Constructor]"+e.getStackTrace().toString());
+
logger.error("[JuniperKeyAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");
}
@@ -119,7 +119,7 @@
EndPoint endpoint = (EndPoint) subject.getChildArray()[0];
String subjectString = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subjectString);
+ logger.debug("[JuniperKeyAdapted][takeAction] subjectString:
" + subjectString);

EventType eventType = null;
String eventTypeString = "";
@@ -129,20 +129,20 @@
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

} catch (Exception e) {
-
logger.error("[JUNIPERKEYADAPTER][TakeAction]"+e.getStackTrace().toString());
+
logger.error("[JuniperKeyAdapter][TakeAction]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.command",
"No Command/EventType specified in
request");
}

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

+ logger.debug("[JuniperKeyAdapted][takeAction]
eventTypeString: " + eventTypeString);
long last = 0;

String rate;
try {
rate = properties.getProperty(subjectString, "rate");
} catch (PerfSONARException e2) {
-
logger.error("[JUNIPERKEYADAPTER][TakeAction]"+e2.getStackTrace().toString());
+
logger.error("[JuniperKeyAdapter][TakeAction]"+e2.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");
}
@@ -173,18 +173,18 @@
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e1) {
-
logger.error("[JUNIPERKEYADAPTER][TakeAction]"+e1.getStackTrace().toString());
+
logger.error("[JuniperKeyAdapter][TakeAction]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve
token for request");
} catch (IOException e1) {
-
logger.error("[JUNIPERKEYADAPTER][TakeAction]"+e1.getStackTrace().toString());
+
logger.error("[JuniperKeyAdapter][TakeAction]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve
token for request");
}

//e.printStackTrace();
} catch (IOException e) {
-
logger.error("[JUNIPERKEYADAPTER][TakeAction]"+e.getStackTrace().toString());
+
logger.error("[JuniperKeyAdapter][TakeAction]"+e.getStackTrace()[0].toString());
}

if (System.currentTimeMillis() - last > rateLong) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/JuniperSshAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -88,7 +88,7 @@

} catch (PerfSONARException e) {

-
logger.error("[JUNIPERSSHADAPTER][Constructor]"+e.getStackTrace().toString());
+
logger.error("[JuniperSshAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");
}
@@ -119,7 +119,7 @@
EndPoint endpoint = (EndPoint) subject.getChildArray()[0];
String subjectString = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subjectString);
+ logger.debug("[JuniperSshAdapted][takeAction] subjectString:
" + subjectString);

EventType eventType = null;
String eventTypeString = "";
@@ -129,20 +129,20 @@
//eventTypeString =
eventTypeString.substring(ServicePropertiesConfigurator.EVENTTYPE_PREFIX.length()-1,
eventTypeString.lastIndexOf("/"));

} catch (Exception e) {
-
logger.error("[JUNIPERSSHADAPTER][TakeAction]"+e.getStackTrace().toString());
+
logger.error("[JuniperSshAdapter][TakeAction]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.command",
"No Command/EventType specified in
request");
}

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

+ logger.debug("[JuniperSshAdapted][takeAction]
eventTypeString: " + eventTypeString);
long last = 0;

String rate;
try {
rate = properties.getProperty(subjectString, "rate");
} catch (PerfSONARException e2) {
-
logger.error("[JUNIPERSSHADAPTER][TakeAction]"+e2.getStackTrace().toString());
+
logger.error("[JuniperSshAdapter][TakeAction]"+e2.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");
}
@@ -173,18 +173,18 @@
s.writeLong(System.currentTimeMillis());
s.flush();
} catch (FileNotFoundException e1) {
-
logger.error("[JUNIPERSSHADAPTER][TakeAction]"+e1.getStackTrace().toString());
+
logger.error("[JuniperSshAdapter][TakeAction]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve
token for request");
} catch (IOException e1) {
-
logger.error("[JUNIPERSSHADAPTER][TakeAction]"+e1.getStackTrace().toString());
+
logger.error("[JuniperSshAdapter][TakeAction]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.token",
"Unable to write/retrieve
token for request");
}

//e.printStackTrace();
} catch (IOException e) {
-
logger.error("[JUNIPERSSHADAPTER][TakeAction]"+e.getStackTrace().toString());
+
logger.error("[JuniperSshAdapter][TakeAction]"+e.getStackTrace()[0].toString());
}

if (System.currentTimeMillis() - last > rateLong) {

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -28,6 +28,7 @@
import org.jdom.Namespace;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
+import org.perfsonar.base.exceptions.PerfSONARException;
import
org.perfsonar.service.measurementPoint.lookingGlassType.encryption.PasswordEncryptor;

/**
@@ -1066,6 +1067,8 @@
}
} catch (IOException e) {
e.printStackTrace();
+ } catch (PerfSONARException e) {
+ e.printStackTrace();
}

System.out.println();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -28,9 +28,8 @@
import org.perfsonar.base.exceptions.PerfSONARException;
import org.perfsonar.service.base.engine.ActionType;
import org.perfsonar.service.base.engine.ServiceEngine;
-import org.perfsonar.service.base.registration.GenericServiceLSRegistrator;
-import org.perfsonar.service.base.registration.PropertiesServiceDescription;
-import org.perfsonar.service.base.registration.ServiceLSRegistrator;
+import org.perfsonar.service.base.messages.EchoRequest;
+import
org.perfsonar.service.measurementPoint.lookingGlassType.internalChecks.InternalChecker;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
import
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;

@@ -42,7 +41,7 @@
* TODO::Parse output ??
*
* @author Stijn Verstichel
- *
+ * @author Stijn Melis
*/
public class WebserviceEngineAdapter implements ServiceEngine {

@@ -90,7 +89,7 @@

} catch (PerfSONARException e) {

-
logger.error("[WEBSERVICEENGINEADAPTER][Constructor]"+e.getStackTrace()[0].toString());
+
logger.error("[WebserviceEngineAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

@@ -122,14 +121,18 @@
Data[] requestData = request.getDataArray();

if (actionType.equalsIgnoreCase(ActionType.GET_KEY)) {
-
+ logger.debug("[WebserviceEngineAdapter] Message type:
MetadataKeyRequest");
return createServiceCapabilitiesResponse(request);

- } // Find the correct handler for the device requested
+ } else if (actionType.equalsIgnoreCase(ActionType.ECHO)) {
+ logger.debug("[WebserviceEngineAdapter] Message type:
EchoRequest");
+ return createEchoResponse(request);
+
+ }// Find the correct handler for the device requested
else {
+ logger.debug("[WebserviceEngineAdapter] Message type:
SetupDataRequest");
+ logger.debug("[WebserviceEngineAdapter][takeAction] Number of
blocks: " + requestMetadata.length);

- logger.debug("NUMBER OF BLOCKs: " + requestMetadata.length);
-
messages = new Message[requestMetadata.length];
RequestMonitor requestMonitor = new RequestMonitor(
requestMetadata.length);
@@ -152,7 +155,7 @@

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

- logger.debug("Device: " + value);
+ logger.debug("[WebserviceEngineAdapter][takeAction]
Device: " + value);
//logger.debug("Device index: " +
devices.indexOf(value));
//logger.debug("Size of Count: " + count.length +
"\nindex of device: " + devices.indexOf(value));
count[devices.indexOf(value)]++;
@@ -161,7 +164,7 @@
currentDevices[i] = devices.indexOf(value);
//contains the indexes of the devices in use
//logger.debug("currentDevices["+i+"]: " +
currentDevices[i]);

- logger.debug("Number of current connections for
device \"" + value + "\": " + count[currentDevices[i]]);
+ logger.debug("[WebserviceEngineAdapter][takeAction]
Number of current connections for device \"" + value + "\": " +
count[currentDevices[i]]);

if (Integer.parseInt(configuration.getProperty(value,
"numberOfUsers")) <= 0 // numberOfUsers <= 0 --> unlimited amount of users
|| count[devices.indexOf(value)] <=
Integer.parseInt(configuration.getProperty(value, "numberOfUsers"))){
@@ -288,7 +291,7 @@
//toolkit.beep();
Thread.sleep(2000);
} catch (InterruptedException e) {
-
logger.error("[WEBSERVICEENGINEADAPTER][TakeAction]"+e.getStackTrace()[0].toString());
+ logger.error("[WebserviceEngineAdapter][TakeAction]
"+e.getStackTrace()[0].toString());
}
}

@@ -316,7 +319,7 @@
for (int i = 0; i<currentDevices.length; i++) {
if (currentDevices[i] > -1) {
count[currentDevices[i]]--;
- logger.debug("Concurrent connections for device \"" +
devices.get(i) +
+ logger.debug("[WebserviceEngineAdapter][takeAction]
Concurrent connections for device \"" + devices.get(i) +
"\" decreased by 1; concurrent
connections: "+ count[currentDevices[i]]);
}
}
@@ -370,7 +373,7 @@
try {
metaparam.setParameterValue(configuration.getProperty(token,
"url"));
} catch (PerfSONARException e1) {
-
logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
url parameter not found for device: "+ token);
+
logger.debug("[WebserviceEngineAdapter][CreateServiceCapabilitiesResponse]
url parameter not found for device: "+ token);
}

metaParams.addChild(metaparam);
@@ -395,7 +398,7 @@

eventType = new EventType();
eventType.addText(innerToken);
- logger.debug(innerToken);
+
logger.debug("[WebserviceEngineAdapter][CreateServiceCapabilitiesResponse]
EventType: " + innerToken);

Parameters params = new Parameters();
params.setId("params" + tokencounter);
@@ -406,7 +409,7 @@
param1.setParameterName("description");

param1.setParameterValue(configuration.getProperty(token, innerToken,
"description"));
} catch (PerfSONARException e) {
-
logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
description parameter not found for device: "+ token + " and command: " +
innerToken);
+
logger.debug("[WebserviceEngineAdapter][CreateServiceCapabilitiesResponse]
description parameter not found for device: "+ token + " and command: " +
innerToken);
}

Parameter param2 = new Parameter();
@@ -415,7 +418,7 @@
param2.setParameterName("syntax");

param2.setParameterValue(configuration.getProperty(token, innerToken,
"syntax"));
} catch (PerfSONARException e) {
-
logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
syntax parameter not found for device: "+ token + " and command: " +
innerToken);
+
logger.debug("[WebserviceEngineAdapter][CreateServiceCapabilitiesResponse]
syntax parameter not found for device: "+ token + " and command: " +
innerToken);
}

Parameter param3 = new Parameter();
@@ -424,7 +427,7 @@
param3.setParameterName("command");

param3.setParameterValue(configuration.getProperty(token, innerToken,
"command"));
} catch (PerfSONARException e) {
-
logger.debug("[WEBSERVICEENGINEADAPTER][CreateServiceCapabilitiesResponse]
command parameter not found for device: "+ token + " and command: " +
innerToken);
+
logger.debug("[WebserviceEngineAdapter][CreateServiceCapabilitiesResponse]
command parameter not found for device: "+ token + " and command: " +
innerToken);
}

params.addChild(param1);
@@ -508,6 +511,134 @@

}

+ private Message createEchoResponse(Message request){
+ String testEventType =
"http://schemas.perfsonar.net/tools/admin/selftest/1.0";;
+
+ try {
+ Message response = new Message();
+
+ Metadata reqMetadata = request.getMetadataArray()[0];
+ Data reqData = request.getDataArray()[0];
+ EventType reqEventType = reqMetadata.getEventType();
+
+ if
(reqEventType.getEventType().equals(testEventType)){
+
logger.debug("[WebserviceEngineAdapter][CreateEchoResponse] selftest
started");
+ InternalChecker checker = new
InternalChecker();
+
+ Metadata resMetadata = new Metadata();
+ resMetadata.setId(reqMetadata.getId());
+ resMetadata.setEventType(reqEventType);
+
+ response.setMetadata(resMetadata);
+
+ Data resData = new Data();
+ resData.setId(reqData.getId());
+ resData.setMetadataIdRef(reqMetadata.getId());
+
+ if (checker.checkExist()){
+ List devices = checker.getDevices();
+
+ Metadata[] resDataMetadataBlock = new
Metadata[devices.size() + 1];
+ Data[] resDataDataBlock = new
Data[devices.size() + 1];
+
+ resDataMetadataBlock[0] = new
Metadata();
+
resDataMetadataBlock[0].setId("sshtelnet_eXist_test");
+ EventType evType = new EventType();
+
evType.setEventType("http://schemas.perfsonar.net/tools/admin/selftest/"; +
+
"MP/SSHTELNET/sshtelnet_eXist_test/success/1.0");
+
resDataMetadataBlock[0].setEventType(evType);
+
+ resDataDataBlock[0] = new Data();
+
resDataDataBlock[0].setId("data_sshtelnet_eXist_test");
+
resDataDataBlock[0].setMetadataIdRef("sshtelnet_eXist_test");
+ Datum datum = new Datum();
+ datum.setValue("eXist database
reachable and metadata configuration file found");
+ resDataDataBlock[0].setDatum(datum);
+
+
resData.addChild(resDataMetadataBlock[0]);
+ resData.addChild(resDataDataBlock[0]);
+
+ // for every device, test the device
+ Iterator<String> it =
devices.iterator();
+ int i = 1;
+ while (it.hasNext()){
+ String device = it.next();
+ if
(checker.checkDevice(device)){
+
resDataMetadataBlock[i] = new Metadata();
+
resDataMetadataBlock[i].setId("sshtelnet_device_test_"+i);
+ evType = new
EventType();
+
evType.setEventType("http://schemas.perfsonar.net/tools/admin/selftest/"; +
+
"MP/SSHTELNET/sshtelnet_device_test_"+i+"/success/1.0");
+
resDataMetadataBlock[i].setEventType(evType);
+
+ resDataDataBlock[i] =
new Data();
+
resDataDataBlock[i].setId("data_sshtelnet_device_test_"+i);
+
resDataDataBlock[i].setMetadataIdRef("sshtelnet_device_test_"+i);
+ datum = new Datum();
+
datum.setValue("Device " + device + " reachable: OK");
+
resDataDataBlock[i].setDatum(datum);
+
+
resData.addChild(resDataMetadataBlock[i]);
+
resData.addChild(resDataDataBlock[i]);
+
+
+ } else {
+
resDataMetadataBlock[i] = new Metadata();
+
resDataMetadataBlock[i].setId("sshtelnet_device_test_"+i);
+ evType = new
EventType();
+
evType.setEventType("http://schemas.perfsonar.net/tools/admin/selftest/"; +
+
"MP/SSHTELNET/sshtelnet_device_test_"+i+"/failure/1.0");
+
resDataMetadataBlock[i].setEventType(evType);
+
+ resDataDataBlock[i] =
new Data();
+
resDataDataBlock[i].setId("data_sshtelnet_device_test_"+i);
+
resDataDataBlock[i].setMetadataIdRef("sshtelnet_device_test_"+i);
+ datum = new Datum();
+
datum.setValue("Device " + device + " not reachable! The MP will not be able"
+
+ " to
issue commands on this device!");
+
resDataDataBlock[i].setDatum(datum);
+
+
resData.addChild(resDataMetadataBlock[i]);
+
resData.addChild(resDataDataBlock[i]);
+
+
+ }
+ i++;
+ }
+ response.addChild(resData);
+ } else {
+ Metadata resDataMetadata = new
Metadata();
+
resDataMetadata.setId("sshtelnet_eXist_test");
+ EventType evType = new EventType();
+
evType.setEventType("http://schemas.perfsonar.net/tools/admin/selftest/"; +
+
"MP/SSHTELNET/sshtelnet_eXist_test/failure/1.0");
+ resDataMetadata.setEventType(evType);
+
+ Data resDataData = new Data();
+
resDataData.setId("data_sshtelnet_eXist_test");
+
resDataData.setMetadataIdRef("sshtelnet_eXist_test");
+ Datum datum = new Datum();
+ datum.setValue("eXist database not
reachable or no metadata configuration file found in eXist database.");
+ resDataData.setDatum(datum);
+
+ resData.addChild(resDataMetadata);
+ resData.addChild(resDataData);
+
+ response.addChild(resData);
+ }
+ } else if
(reqEventType.getEventType().equals(EchoRequest.ECHO_NAMESPACE)){
+
logger.debug("[WebserviceEngineAdapter][CreateEchoResponse] regular
EchoRequest");
+ EchoRequest echo = new EchoRequest();
+ return echo.execute(request);
+ }
+ return response;
+ } catch (PerfSONARException e) {
+
logger.error("[WebserviceEngineAdapter][CreateEchoResponse] An error occured
while doing" +
+ " the internal check: " +
e.getStackTrace()[0].toString());
+ return null;
+ }
+ }
+
/*private void registerServiceWithLS() {

try {

Added:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoIpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -84,13 +84,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOIPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoIpAdapter] Constructor finished");
+ logger.info("[CiscoIpAdapter] Constructor finished");

}// CiscoIpAdapter

@@ -100,7 +100,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoIpAdapter] getAvailableSpecificCommands called");
+ logger.info("[CiscoIpAdapter] getAvailableSpecificCommands called");

return availableSpecificCommands;

@@ -110,7 +110,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoIpAdapter] setAvailableSpecificCommand called");
+ logger.info("[CiscoIpAdapter] setAvailableSpecificCommand called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -120,7 +120,7 @@
*/
public void addAvailableSpecificCommand(IpCommandInterface command) {

- logger.debug("[CiscoIpAdapter] addAvailableSpecificCommand called");
+ logger.info("[CiscoIpAdapter] addAvailableSpecificCommand called");

availableSpecificCommands.add(command);

@@ -131,7 +131,7 @@
public IpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoIpAdapter] getCommand called");
+ logger.info("[CiscoIpAdapter] getCommand called");

IpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -142,7 +142,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoIpAdapter] Command found");
+ logger.debug("[CiscoIpAdapter] Command found: " + command);
return command;

}
@@ -159,7 +159,7 @@
*/
public IpCommandInterface executeCommand(IpCommandInterface command) {

- logger.debug("[CiscoIpAdapter] executeCommand called");
+ logger.info("[CiscoIpAdapter] executeCommand called");

if (manager != null) {

@@ -177,7 +177,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoIpAdapter][executeCommand] New result returned");
cachedResults.add(command);
logger.debug("[CiscoIpAdapter] executeCommand finished");
return command;
@@ -191,7 +191,7 @@
*/
public void connect(String subject) throws PerfSONARException {

- logger.debug("[CiscoIpAdapter] Connect called");
+ logger.info("[CiscoIpAdapter] Connect called");

try {

@@ -208,8 +208,8 @@
"Username or password not set");
}
} catch (Exception e) {
- logger.error("[CiscoIpAdapter] Error in configuration");
- logger.error("[CISCOIPADAPTER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][connect] Error in
configuration");
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
@@ -220,16 +220,16 @@

}

- logger.debug("[CiscoIpAdapter] Trying to connect");
+ logger.info("[CiscoIpAdapter][connect] Trying to connect");

manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.debug("[CiscoIpv6Adapter Login");
+ logger.info("[CiscoIpAdapter][connect] Logged in");

} catch (Exception e) {

- logger.error("[CiscoIpAdapter] Error occuring while connecting");
- logger.error("[CISCOIPADAPTER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][connect] Error occuring while
connecting");
+ logger.error("[CiscoIpAdapter][connect]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -281,7 +281,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoIpAdapter] Configuring available operations
...");
+ logger.info("[CiscoIpAdapter] Configuring available operations ...");

Iterator commands = null;
String token = null;
@@ -300,17 +300,16 @@
else if (token.endsWith("RECEIVED"))
command.setSuffix("received-routes");
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
- logger.error("[CISCOIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][ConfigureCommands]
MinParamCount not found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
- logger.error("[CISCOIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][ConfigureCommands]
MaxParamCount not found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -322,7 +321,7 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOIPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -336,7 +335,7 @@
// IpCommand(ActionType.MP_IP_ROUTESUPERNETS, "show ip route
// supernets-only"));

- logger.debug("[CiscoIpAdapter] Available operations configured");
+ logger.info("[CiscoIpAdapter] Available operations configured");

}

@@ -404,14 +403,15 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoIpAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoIpAdapter][takeAction] EventTypeString: " +
eventTypeString);
+

CiscoIpAdapter adapter = new CiscoIpAdapter();

@@ -431,20 +431,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][TakeAction] One of the numbers in
the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve url");

}

- logger.debug("[CiscoStatusAdapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[CiscoIpAdapter][takeAction] TelnetManager created: "
+ url + " " + port);

try {

@@ -452,13 +453,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOIPADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[CiscoIpAdapter][takeAction] Prompt set in
TelnetManager: " + prompt);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -478,7 +479,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoIpAdapter][takeAction] Parameter value:
" + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -502,12 +503,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoIpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -538,12 +539,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoIpAdapter][takeAction] Cached result
returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoIpAdapter][takeAction] Cached result
removed");
it.remove();

}
@@ -565,7 +566,7 @@

}

- logger.info("[CiscoIpAdapter] Command executed succesfully");
+ logger.info("[CiscoIpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -574,7 +575,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoIpAdapter] Constructing response message");
+ logger.info("[CiscoIpAdapter][takeAction] Constructing response
message");

Message response = new Message();

@@ -589,13 +590,10 @@
}
response.setData(respData[0]);

- logger.debug(respMetaData + "");
- logger.debug(respData + "");
-
// response.setSonarMetadata(request.getSonarMetadata());
// response.setSonarData(new Data[] { data });

- logger.info("[CiscoIpAdapter] takeAction finished");
+ logger.info("[CiscoIpAdapter][takeAction] takeAction finished");

return response;
// return new ServiceEngineResponse();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -104,13 +104,13 @@

} catch (PerfSONARException e) {

-
logger.error("[CISCOKEYIPADAPTER][Constructor]"+e.getStackTrace().toString());
+
logger.error("[CiscoKeyIpAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the
properties and/or logger instances.");

}

- logger.debug("[CiscoKeyIpAdapter] Constructor finished");
+ logger.info("[CiscoKeyIpAdapter] Constructor finished");

}// CiscoKeyIpAdapter

@@ -121,8 +121,7 @@
*/
public List getAvailableSpecificCommands() {

- logger
- .debug("[CiscoKeyIpAdapter]
getAvailableSpecificCommands called");
+ logger.info("[CiscoKeyIpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -133,8 +132,7 @@
*/
public void setAvailableSpecificCommands(List
availableSpecificCommands) {

- logger
- .debug("[CiscoKeyIpAdapter]
setAvailableSpecificCommand called");
+ logger.info("[CiscoKeyIpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -145,8 +143,7 @@
*/
public void addAvailableSpecificCommand(IpCommandInterface command) {

- logger
- .debug("[CiscoKeyIpAdapter]
addAvailableSpecificCommand called");
+ logger.info("[CiscoKeyIpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -158,7 +155,7 @@
public IpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoKeyIpAdapter] getCommand called");
+ logger.info("[CiscoKeyIpAdapter] getCommand called");

IpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -169,7 +166,7 @@

if
(command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoKeyIpAdapter] Command
found");
+ logger.debug("[CiscoKeyIpAdapter] Command
found: " + command);
return command;

}
@@ -187,11 +184,10 @@
*/
public IpCommandInterface executeCommand(IpCommandInterface command) {

- logger.debug("[CiscoKeyIpAdapter] executeCommand called");
+ logger.info("[CiscoKeyIpAdapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = "";
if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
@@ -203,9 +199,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoKeyIpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand
finished");
+ logger.debug("[CiscoKeyIpAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -236,8 +232,8 @@
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Username or
KeyURL not set");
} catch (Exception e) {
- logger.error("[CiscoKeyIpAdapter]
Error in configuration");
-
logger.error(e.getStackTrace().toString());
+
logger.error("[CiscoKeyIpAdapter][connect] Error in configuration");
+
logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching =
Integer.parseInt(properties.getProperty(subject, "cache"));
@@ -249,17 +245,10 @@

}

- logger.info("[CiscoKeyIpAdapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals(""))
- //manager.connect(username, keyUrl);
- //else manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- logger.info("[CiscoKeyIpAdapter] Login");
-
} catch (Exception e) {

logger.error("[CiscoKeyIpAdapter] Error occuring
while connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying
device");

@@ -313,8 +302,7 @@
*/
private void configureCommands(String subject) throws
PerfSONARException {

- logger
- .debug("[CiscoKeyIpAdapter] Configuring
available operations ...");
+ logger.info("[CiscoKeyIpAdapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -339,14 +327,14 @@

.getProperty(subject, token, "minParamCount"));

command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOKEYIPADAPTER][ConfigureCommands]"+e1.getStackTrace().toString());
+
logger.error("[CiscoKeyIpAdapter][ConfigureCommands] MinParamCount not found:
"+e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties

.getProperty(subject, token, "maxParamCount"));

command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOKEYIPADAPTER][ConfigureCommands]"+e1.getStackTrace().toString());
+
logger.error("[CiscoKeyIpAdapter][ConfigureCommands] MaxParamCount not found:
"+e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -358,13 +346,13 @@

} catch (PerfSONARException e) {

-
logger.error("[CISCOKEYIPADAPTER][ConfigureCommands]"+e.getStackTrace().toString());
+ logger.error("[CiscoKeyIpAdapter][ConfigureCommands]
Unable to retrieve commands: "+e.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoKeyIpAdapter] Available operations
configured");
+ logger.info("[CiscoKeyIpAdapter] Available operations
configured");

}

@@ -426,8 +414,7 @@
public Message takeAction(String actionType, Message request)
throws PerfSONARException {

- logger
- .info("[CiscoKeyIpAdapter] Webservice
takeAction call received");
+ logger.info("[CiscoKeyIpAdapter] Webservice takeAction call
received");

Metadata[] metadata = request.getMetadataArray();
Subject s = metadata[0].getSubject();
@@ -435,13 +422,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoKeyIpAdapter][takeAction] SubjectString:
" + subject);

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

-
+ logger.debug("[CiscoKeyIpAdapter][takeAction]
EventTypeString: " + eventTypeString);
+
//CiscoKeyIpAdapter adapter = new CiscoKeyIpAdapter();

//adapter.connect(subject);
@@ -461,7 +449,7 @@
"Username or KeyURL
not set");
} catch (PerfSONARException e) {
logger.error("[CiscoKeyIpAdapter] Error in
configuration");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching =
Integer.parseInt(properties.getProperty(subject, "cache"));
@@ -471,20 +459,21 @@

} catch (NumberFormatException e1) {

-
logger.error("[CISCOKEYIPADAPTER][TakeAction]"+e1.getStackTrace().toString());
- throw new PerfSONARException(
- "error.mp.sshtelnet.configuration",
- "Invalid port number in
configuration");
+ logger.error("[CiscoKeyIpAdapter][TakeAction] One of
the numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
+ throw new PerfSONARException(
+ "error.mp.sshtelnet.configuration",
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

-
logger.error("[CISCOKEYIPADAPTER][TakeAction]"+e1.getStackTrace().toString());
+
logger.error("[CiscoKeyIpAdapter][TakeAction]"+e1.getStackTrace()[0].toString());
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection
details");

}

- logger.debug("[CiscoKeyIpAdapter] TelnetManager created: " +
url
+ logger.debug("[CiscoKeyIpAdapter] SshKeyManager created: " +
url
+ " " + port);

// This private method call will include all supported methods
@@ -502,7 +491,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoKeyIpAdapter][takeAction]
Parameter Value: " + parameter);

if (new
ParameterChecker().checkParam(subject, eventTypeString,
parameter)) {
@@ -532,12 +521,12 @@
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&&
cachedCommand.getTimestamp()+(caching*1000) > System.currentTimeMillis()) {

- logger.info("CACHED RESULT
RETURNED");
+
logger.info("[CiscoKeyIpAdapter][takeAction] Cached result returned");
temp =
cachedCommand.getResult();

} else if
(cachedCommand.getTimestamp()+(caching*1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT
REMOVED");
+
logger.info("[CiscoKeyIpAdapter][takeAction] Cached result removed");
it.remove();

}
@@ -571,12 +560,12 @@
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&&
cachedCommand.getTimestamp()+(caching*1000) > System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+
logger.info("[CiscoKeyIpAdapter][takeAction] Cached result returned");
temp = cachedCommand.getResult();

} else if
(cachedCommand.getTimestamp()+(caching*1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+
logger.info("[CiscoKeyIpAdapter][takeAction] Cached result removed");
it.remove();

}
@@ -598,7 +587,7 @@

}

- logger.info("[CiscoKeyIpAdapter] Command executed
succesfully");
+ logger.info("[CiscoKeyIpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid)
@@ -608,7 +597,7 @@

datum.setDatum(filterResult(temp, ipCommand));

- logger.info("[CiscoKeyIpAdapter] Constructing response
message");
+ logger.info("[CiscoKeyIpAdapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -84,16 +84,14 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHIPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshIpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoSshIpAdapter] Constructor started");
+ logger.info("[CiscoSshIpAdapter] Constructor finished");

- logger.debug("[CiscoSshIpAdapter] Constructor finished");
-
}// CiscoSshIpAdapter

// ---------------------- public methods
@@ -102,7 +100,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoSshIpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoSshIpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -112,7 +110,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoSshIpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoSshIpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -122,7 +120,7 @@
*/
public void addAvailableSpecificCommand(IpCommandInterface command) {

- logger.debug("[CiscoSshIpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoSshIpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -133,7 +131,7 @@
public IpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoSshIpAdapter] getCommand called");
+ logger.info("[CiscoSshIpAdapter] getCommand called");

IpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -144,7 +142,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoSshIpAdapter] Command found");
+ logger.debug("[CiscoSshIpAdapter] Command found: " +
command);
return command;

}
@@ -161,7 +159,7 @@
*/
public IpCommandInterface executeCommand(IpCommandInterface command) {

- logger.debug("[CiscoSshIpAdapter] executeCommand called");
+ logger.info("[CiscoSshIpAdapter] executeCommand called");

if (manager != null) {

@@ -176,7 +174,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoSshIpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[CiscoSshIpAdapter] executeCommand finished");
return command;
@@ -207,8 +205,8 @@
"Username or password not set");
}
} catch (Exception e) {
- logger.error("[CiscoSshIpAdapter] Error in
configuration");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoSshIpAdapter][connect] Error in
configuration");
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
@@ -220,16 +218,10 @@
manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}

- logger.info("[CiscoSshIpAdapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[CiscoSshIpAdapter Login");
-
} catch (Exception e) {

- logger.error("[CiscoSshIpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoSshIpAdapter][connect] Error occuring while
connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -281,7 +273,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoSshIpAdapter] Configuring available operations
...");
+ logger.info("[CiscoSshIpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -305,13 +297,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoSshIpAdapter][ConfigureCommands]
MinParamCount not found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoSshIpAdapter][ConfigureCommands]
MaxParamCount not found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -323,13 +315,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHIPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshIpAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoSshIpAdapter] Available operations configured");
+ logger.info("[CiscoSshIpAdapter] Available operations configured");

}

@@ -397,14 +389,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoSshIpAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoSshIpAdapter][takeAction] EventTypeString: " +
eventTypeString);

//CiscoSshIpAdapter adapter = new CiscoSshIpAdapter();

@@ -426,14 +418,15 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOSSHIPADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshIpAdapter][TakeAction] One of the numbers
in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOSSHIPADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshIpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

@@ -459,7 +452,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoSshIpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -483,12 +476,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshIpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -519,12 +512,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshIpAdapter][takeAction] Cached
result returnedD");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -546,7 +539,7 @@

}

- logger.info("[CiscoSshIpAdapter] Command executed succesfully");
+ logger.info("[CiscoSshIpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -555,7 +548,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoSshIpAdapter] Constructing response message");
+ logger.info("[CiscoSshIpAdapter][takeAction] Constructing response
message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperIpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -84,13 +84,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERIPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperIpAdapter] Constructor finished");
+ logger.info("[JuniperIpAdapter] Constructor finished");

}// JuniperIpAdapter

@@ -100,7 +100,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperIpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperIpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -110,7 +110,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperIpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperIpAdapter] setAvailableSpecificCommand called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -120,7 +120,7 @@
*/
public void addAvailableSpecificCommand(IpCommandInterface command) {

- logger.debug("[JuniperIpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperIpAdapter] addAvailableSpecificCommand called");

availableSpecificCommands.add(command);

@@ -131,7 +131,7 @@
public IpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperIpAdapter] getCommand called");
+ logger.info("[JuniperIpAdapter] getCommand called");

IpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -142,7 +142,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperIpAdapter] Command found");
+ logger.debug("[JuniperIpAdapter] Command found: " + command);
return command;

}
@@ -159,7 +159,7 @@
*/
public IpCommandInterface executeCommand(IpCommandInterface command) {

- logger.debug("[JuniperIpAdapter] executeCommand called");
+ logger.info("[JuniperIpAdapter] executeCommand called");

if (manager != null) {

@@ -176,7 +176,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperIpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[JuniperIpAdapter] executeCommand finished");
return command;
@@ -190,7 +190,7 @@
*/
public void connect(String subject) throws PerfSONARException {

- logger.debug("[JuniperIpAdapter] Connect called");
+ logger.info("[JuniperIpAdapter] Connect called");

try {

@@ -207,8 +207,8 @@
"Username or password not set");
}
} catch (Exception e) {
- logger.error("[JuniperIpAdapter] Error in
configuration");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][connect] Error in
configuration");
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
@@ -219,16 +219,16 @@

}

- logger.debug("[JuniperIpAdapter] Trying to connect");
+ logger.info("[JuniperIpAdapter][connect] Trying to connect");

manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.debug("[JuniperIpv6Adapter Login");
+ logger.info("[JuniperIpAdapter][connect] Logged in");

} catch (Exception e) {

- logger.error("[JuniperIpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][connect] Error occuring while
connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -280,7 +280,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperIpAdapter] Configuring available operations
...");
+ logger.info("[JuniperIpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -303,13 +303,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
- logger.error("[JUNIPERIPADAPTER][ConfigureCommands]"
+ e1.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][ConfigureCommands]
MinParamCount not found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
- logger.error("[JUNIPERIPADAPTER][ConfigureCommands]"
+ e1.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][ConfigureCommands]
MaxParamCount not found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -321,7 +321,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERIPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -331,7 +331,7 @@
//this.addAvailableSpecificCommand(new
IpCommand(ActionType.MP_IP_ROUTE, "show ip route"));
//this.addAvailableSpecificCommand(new
IpCommand(ActionType.MP_IP_ROUTESUPERNETS, "show ip route supernets-only"));

- logger.debug("[JuniperIpAdapter] Available operations configured");
+ logger.info("[JuniperIpAdapter] Available operations configured");

}

@@ -407,12 +407,13 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperIpAdapter][takeAction] SubjectString: " +
subject);

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

+ logger.debug("[JuniperIpAdapter][takeAction] EventTypeString: " +
eventType);

JuniperIpAdapter adapter = new JuniperIpAdapter();
//adapter.connect(subject);
@@ -431,20 +432,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][TakeAction] One of the numbers
in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[JuniperIpAdapter] TelnetManager created: " + url + "
" + port);
+ logger.debug("[JuniperIpAdapter][takeAction] TelnetManager created:
" + url + " " + port);

try {

@@ -452,13 +454,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERIPADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[JuniperIpAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

}

- logger.debug("[JuniperIpAdapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[JuniperIpAdapter][takeAction] Prompt set in
TelnetManager: " + prompt);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -476,7 +478,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperIpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -500,12 +502,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperIpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -536,12 +538,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperIpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -563,7 +565,7 @@

}

- logger.info("[JuniperIpAdapter] Command executed succesfully");
+ logger.info("[JuniperIpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -572,7 +574,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperIpAdapter] Constructing response message");
+ logger.info("[JuniperIpAdapter][takeAction] Constructing response
message");

Message response = new Message();

@@ -585,9 +587,6 @@
response.setMetadata(respMetaData[0]);
response.setData(respData[0]);

- logger.debug(respMetaData + "");
- logger.debug(respData + "");
-
//response.setSonarMetadata(request.getSonarMetadata());

//response.setSonarData(new Data[] { data });

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -87,13 +87,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYIPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperKeyIpAdapter] Constructor finished");
+ logger.info("[JuniperKeyIpAdapter] Constructor finished");

}// JuniperKeyIpAdapter

@@ -103,7 +103,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperKeyIpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperKeyIpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -113,7 +113,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperKeyIpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyIpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -123,7 +123,7 @@
*/
public void addAvailableSpecificCommand(IpCommandInterface command) {

- logger.debug("[JuniperKeyIpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyIpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -134,7 +134,7 @@
public IpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperKeyIpAdapter] getCommand called");
+ logger.info("[JuniperKeyIpAdapter] getCommand called");

IpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -145,7 +145,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperKeyIpAdapter] Command found");
+ logger.debug("[JuniperKeyIpAdapter] Command found: " +
command);
return command;

}
@@ -162,11 +162,10 @@
*/
public IpCommandInterface executeCommand(IpCommandInterface command) {

- logger.debug("[JuniperKeyIpAdapter] executeCommand called");
+ logger.info("[JuniperKeyIpAdapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = "";
if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
@@ -177,9 +176,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperKeyIpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[JuniperKeyIpAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -209,8 +208,8 @@
"Username or KeyURL not set");
}
} catch (Exception e) {
- logger.error("[JuniperKeyIpAdapter] Error in
configuration");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][connect] Error in
configuration");
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
@@ -222,19 +221,10 @@

}

- logger.info("[JuniperKeyIpAdapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- //manager.connect(username, keyUrl);
- //} else {
- //manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.info("[JuniperKeyIpAdapter] Login");
-
} catch (Exception e) {

- logger.error("[JuniperKeyIpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -286,7 +276,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperKeyIpAdapter] Configuring available operations
...");
+ logger.info("[JuniperKeyIpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -309,13 +299,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyIpAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyIpAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -327,13 +317,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYIPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperKeyIpAdapter] Available operations
configured");
+ logger.info("[JuniperKeyIpAdapter] Available operations configured");

}

@@ -415,13 +405,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperKeyIpAdapter][takeAction] SubjectString: " +
subject);

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

-
+ logger.debug("[JuniperKeyIpAdapter][takeAction] EventTypeString: " +
eventType);
+
//JuniperKeyIpAdapter adapter = new JuniperKeyIpAdapter();

//adapter.connect(subject);
@@ -441,8 +432,8 @@
"Username or KeyURL not set");
}
} catch (PerfSONARException e) {
- logger.error("[JuniperKeyIpAdapter] Error in configuration");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][takeAction] Error in
configuration");
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
@@ -452,19 +443,20 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERKEYIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERKEYIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyIpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");
}

- logger.debug("[JuniperKeyIpAdapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[JuniperKeyIpAdapter] SshKeyManager created: " + url +
" " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -481,7 +473,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperKeyIpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -505,12 +497,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyIpAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyIpAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -541,12 +533,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyIpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -568,7 +560,7 @@

}

- logger.info("[JuniperKeyIpAdapter] Command executed succesfully");
+ logger.info("[JuniperKeyIpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -579,7 +571,7 @@

datum.setDatum(filterResult(temp, ipCommand));

- logger.info("[JuniperKeyIpAdapter] Constructing response message");
+ logger.info("[JuniperKeyIpAdapter][takeAction] Constructing response
message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -85,16 +85,14 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHIPADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshIpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperSshIpAdapter] Constructor started");
+ logger.info("[JuniperSshIpAdapter] Constructor finished");

- logger.debug("[JuniperSshIpAdapter] Constructor finished");
-
}// JuniperSshIpAdapter

// ---------------------- public methods
@@ -103,7 +101,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperSshIpAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperSshIpAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -113,7 +111,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperSshIpAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperSshIpAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -123,7 +121,7 @@
*/
public void addAvailableSpecificCommand(IpCommandInterface command) {

- logger.debug("[JuniperSshIpAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperSshIpAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -134,7 +132,7 @@
public IpCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperSshIpAdapter] getCommand called");
+ logger.info("[JuniperSshIpAdapter] getCommand called");

IpCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -145,7 +143,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperSshIpAdapter] Command found");
+ logger.debug("[JuniperSshIpAdapter] Command found: " +
command);
return command;

}
@@ -162,7 +160,7 @@
*/
public IpCommandInterface executeCommand(IpCommandInterface command) {

- logger.debug("[JuniperSshIpAdapter] executeCommand called");
+ logger.info("[JuniperSshIpAdapter] executeCommand called");

if (manager != null) {

@@ -175,7 +173,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperSshIpAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[JuniperSshIpAdapter] executeCommand finished");
return command;
@@ -206,8 +204,8 @@
"Username or password not set");
}
} catch (Exception e) {
- logger.error("[JuniperSshIpAdapter] Error in
configuration");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperSshIpAdapter][connect] Error in
configuration");
+ logger.error(e.getStackTrace()[0].toString());
throw e;
}
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
@@ -220,16 +218,10 @@

}

- logger.info("[JuniperSshIpAdapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[JuniperSshIpAdapter Login");
-
} catch (Exception e) {

logger.error("[JuniperSshIpAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -281,7 +273,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperSshIpAdapter] Configuring available operations
...");
+ logger.info("[JuniperSshIpAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -305,13 +297,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshIpAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHIPADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshIpAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -323,13 +315,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHIPADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshIpAdapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperSshIpAdapter] Available operations
configured");
+ logger.info("[JuniperSshIpAdapter] Available operations configured");

}

@@ -411,14 +403,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperSshIpAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperSshIpAdapter][takeAction] EventTypeString: " +
eventTypeString);

//JuniperSshIpAdapter adapter = new JuniperSshIpAdapter();

@@ -440,20 +432,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERSSHIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshIpAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERSSHIPADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshIpAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] SshManager created: " + url + " "
+ port);
+ logger.debug("[CiscoStatusAdapter][takeAction] SshManager created: "
+ url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -473,7 +466,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperSshIpAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -497,12 +490,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshIpAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshIpAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -533,12 +526,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipCommand.getParameterString())
&& cachedCommand.getDeviceName().equalsIgnoreCase(ipCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshIpAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshIpAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -560,7 +553,7 @@

}

- logger.info("[JuniperSshIpAdapter] Command executed succesfully");
+ logger.info("[JuniperSshIpAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -569,7 +562,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperSshIpAdapter] Constructing response message");
+ logger.info("[JuniperSshIpAdapter][takeAction] Constructing response
message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoIpv6Adapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -85,16 +85,14 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOIPv6ADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoIpv6Adapter] Constructor started");
+ logger.info("[CiscoIpv6Adapter] Constructor finished");

- logger.debug("[CiscoIpv6Adapter] Constructor finished");
-
}// CiscoIpv6Adapter

// ---------------------- public methods
@@ -103,7 +101,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoIpv6Adapter getAvailableSpecificCommands
called");
+ logger.info("[CiscoIpv6Adapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -113,7 +111,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoIpv6Adapter setAvailableSpecificCommand called");
+ logger.info("[CiscoIpv6Adapter] setAvailableSpecificCommand called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -123,7 +121,7 @@
*/
public void addAvailableSpecificCommand(Ipv6CommandInterface command) {

- logger.debug("[CiscoIpv6Adapter addAvailableSpecificCommand called");
+ logger.info("[CiscoIpv6Adapter] addAvailableSpecificCommand called");

availableSpecificCommands.add(command);

@@ -134,7 +132,7 @@
public Ipv6CommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoIpv6Adapter getCommand called");
+ logger.info("[CiscoIpv6Adapter] getCommand called");

Ipv6CommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -145,14 +143,14 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoIpv6Adapter Command found");
+ logger.debug("[CiscoIpv6Adapter] Command found: " + command);
return command;

}

}// while

- logger.error("[CiscoIpv6Adapter Command NOT found");
+ logger.error("[CiscoIpv6Adapter] Command NOT found");
throw new PerfSONARException("error.mp.sshtelnet.nosuchcommand",
"Requested command not found");

@@ -162,7 +160,7 @@
*/
public Ipv6CommandInterface executeCommand(Ipv6CommandInterface command)
{

- logger.debug("[CiscoIpv6Adapter executeCommand called");
+ logger.info("[CiscoIpv6Adapter] executeCommand called");

if (manager != null) {

@@ -178,9 +176,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoIpv6Adapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[CiscoIpv6Adapter executeCommand finished");
+ logger.debug("[CiscoIpv6Adapter] executeCommand finished");
return command;

}// executeCommand
@@ -192,7 +190,7 @@
*/
public void connect(String subject) throws PerfSONARException {

- logger.debug("[CiscoIpv6Adapter Connect called");
+ logger.info("[CiscoIpv6Adapter] Connect called");

try {

@@ -211,16 +209,16 @@

}

- logger.debug("[CiscoIpv6Adapter Trying to connect");
+ logger.info("[CiscoIpv6Adapter][connect] Trying to connect");

manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.debug("[CiscoIpv6Adapter Login");
+ logger.info("[CiscoIpv6Adapter][connect] Logged in");

} catch (Exception e) {

- logger.error("[CiscoIpv6Adapter Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][connect] Error occuring while
connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -272,7 +270,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoIpv6Adapter Configuring available operations
...");
+ logger.info("[CiscoIpv6Adapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -292,17 +290,16 @@
command.setSuffix("received-routes");

try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
- logger.error("[CISCOIPv6ADAPTER][ConfigureCommands]"
+ e1.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][ConfigureCommands]
MinParamCount not found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
- logger.error("[CISCOIPv6ADAPTER][ConfigureCommands]"
+ e1.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][ConfigureCommands]
MaxParamCount not found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -314,7 +311,7 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOIPv6ADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -323,7 +320,7 @@
//this.addAvailableSpecificCommand(new
Ipv6Command(ActionType.MP_IPv6_FORWARDING, "show ipv6 forwarding"));
//this.addAvailableSpecificCommand(new
Ipv6Command(ActionType.MP_IPv6_ROUTE, "show ipv6 route"));

- logger.debug("[CiscoIpv6Adapter Available operations configured");
+ logger.info("[CiscoIpv6Adapter] Available operations configured");

}

@@ -391,14 +388,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoIpv6Adapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoIpv6Adapter][takeAction] EventTypeString: " +
eventTypeString);

CiscoIpv6Adapter adapter = new CiscoIpv6Adapter();

@@ -418,20 +415,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][TakeAction] One of the numbers
in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[CiscoIpv6Adapter] TelnetManager created: " + url + "
" + port);

try {

@@ -439,13 +437,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOIPv6ADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[CiscoIpv6Adapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

}

- logger.debug("[CiscoStatusAdapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[CiscoIpv6Adapter][takeAction] Prompt set in
TelnetManager: " + prompt);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -465,7 +463,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoIpv6Adapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -489,12 +487,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -525,12 +523,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -552,7 +550,7 @@

}

- logger.info("[CiscoIpv6Adapter Command executed succesfully");
+ logger.info("[CiscoIpv6Adapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -561,7 +559,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoIpv6Adapter Constructing response message");
+ logger.info("[CiscoIpv6Adapter][takeAction] Constructing response
message");

Message response = new Message();

@@ -574,12 +572,10 @@
response.setMetadata(respMetaData[0]);
response.setData(respData[0]);

- logger.debug(respMetaData + "");
- logger.debug(respData + "");

//response.setSonarMetadata(request.getSonarMetadata());

//response.setSonarData(new Data[] { data });
- logger.info("[CiscoIpv6Adapter takeAction finished");
+ logger.info("[CiscoIpv6Adapter] takeAction finished");

return response;
//return new ServiceEngineResponse();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -88,13 +88,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOKEYIPv6ADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyIpv6Adapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoKeyIpv6Adapter] Constructor finished");
+ logger.info("[CiscoKeyIpv6Adapter] Constructor finished");

}// CiscoKeyIpv6Adapter

@@ -104,7 +104,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoKeyIpv6Adapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoKeyIpv6Adapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -114,7 +114,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoKeyIpv6Adapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoKeyIpv6Adapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -124,7 +124,7 @@
*/
public void addAvailableSpecificCommand(Ipv6CommandInterface command) {

- logger.debug("[CiscoKeyIpv6Adapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoKeyIpv6Adapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -135,7 +135,7 @@
public Ipv6CommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoKeyIpv6Adapter] getCommand called");
+ logger.info("[CiscoKeyIpv6Adapter] getCommand called");

Ipv6CommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -146,7 +146,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoKeyIpv6Adapter] Command found");
+ logger.debug("[CiscoKeyIpv6Adapter] Command found: " +
command);
return command;

}
@@ -163,11 +163,10 @@
*/
public Ipv6CommandInterface executeCommand(Ipv6CommandInterface command)
{

- logger.debug("[CiscoKeyIpv6Adapter] executeCommand called");
+ logger.info("[CiscoKeyIpv6Adapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = "";
if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
@@ -179,9 +178,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoKeyIpv6Adapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[CiscoKeyIpv6Adapter] executeCommand finished");
return command;

}// executeCommand
@@ -214,19 +213,10 @@

}

- logger.info("[CiscoKeyIpv6Adapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- // manager.connect(username, keyUrl);
- //} else {
- // manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.info("[CiscoKeyIpv6Adapter] Login");
-
} catch (Exception e) {

- logger.error("[CiscoKeyIpv6Adapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoKeyIpv6Adapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -278,7 +268,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoKeyIpv6Adapter] Configuring available operations
...");
+ logger.info("[CiscoKeyIpv6Adapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -301,13 +291,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOKEYIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoKeyIpv6Adapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOKEYIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoKeyIpv6Adapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -319,13 +309,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOKEYIPv6ADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyIpv6Adapter][ConfigureCommands] Unable to
retrieve commands: " + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoKeyIpv6Adapter] Available operations
configured");
+ logger.info("[CiscoKeyIpv6Adapter] Available operations configured");

}

@@ -393,14 +383,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoKeyIpv6Adapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoKeyIpv6Adapter][takeAction] EventTypeString: " +
eventTypeString);

//CiscoKeyIpv6Adapter adapter = new CiscoKeyIpv6Adapter();

@@ -420,20 +410,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOKEYIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyIpv6Adapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOKEYIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyIpv6Adapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoKeyIpv6Adapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[CiscoKeyIpv6Adapter] SshKeyManager created: " + url +
" " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -451,7 +442,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoKeyIpv6Adapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -475,12 +466,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoKeyIpv6Adapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoKeyIpv6Adapter][takeAction]
Cached result removed");
it.remove();

}
@@ -511,12 +502,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoKeyIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoKeyIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -538,7 +529,7 @@

}

- logger.info("[CiscoKeyIpv6Adapter] Command executed succesfully");
+ logger.info("[CiscoKeyIpv6Adapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -549,7 +540,7 @@

datum.setDatum(filterResult(temp, ipv6Command));

- logger.info("[CiscoKeyIpv6Adapter] Constructing response message");
+ logger.info("[CiscoKeyIpv6Adapter][takeAction] Constructing response
message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -84,16 +84,14 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHIPv6ADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshIpv6Adapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoSshIpv6Adapter] Constructor started");
+ logger.info("[CiscoSshIpv6Adapter] Constructor finished");

- logger.debug("[CiscoSshIpv6Adapter] Constructor finished");
-
}// CiscoSshIpv6Adapter

// ---------------------- public methods
@@ -102,7 +100,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoSshIpv6Adapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoSshIpv6Adapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -112,7 +110,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoSshIpv6Adapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoSshIpv6Adapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -122,7 +120,7 @@
*/
public void addAvailableSpecificCommand(Ipv6CommandInterface command) {

- logger.debug("[CiscoSshIpv6Adapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoSshIpv6Adapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -133,7 +131,7 @@
public Ipv6CommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoSshIpv6Adapter] getCommand called");
+ logger.info("[CiscoSshIpv6Adapter] getCommand called");

Ipv6CommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -144,7 +142,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoSshIpv6Adapter] Command found");
+ logger.debug("[CiscoSshIpv6Adapter] Command found: " +
command);
return command;

}
@@ -161,7 +159,7 @@
*/
public Ipv6CommandInterface executeCommand(Ipv6CommandInterface command)
{

- logger.debug("[CiscoSshIpv6Adapter] executeCommand called");
+ logger.info("[CiscoSshIpv6Adapter] executeCommand called");

if (manager != null) {

@@ -174,7 +172,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoSshIpv6Adapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[CiscoSshIpv6Adapter] executeCommand finished");
return command;
@@ -209,16 +207,10 @@

}

- logger.info("[CiscoSshIpv6Adapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[CiscoSshIpv6Adapter Login");
-
} catch (Exception e) {

- logger.error("[CiscoSshIpv6Adapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoSshIpv6Adapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -290,17 +282,16 @@
command.setSuffix("received-routes");

try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoSshIpv6Adapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoSshIpv6Adapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -312,13 +303,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHIPv6ADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshIpv6Adapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoSshIpv6Adapter] Available operations
configured");
+ logger.info("[CiscoSshIpv6Adapter] Available operations configured");

}

@@ -388,14 +379,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoSshIpv6Adapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoSshIpv6Adapter][takeAction] EventTypeString: " +
eventTypeString);

//CiscoSshIpv6Adapter adapter = new CiscoSshIpv6Adapter();

@@ -417,20 +408,20 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOSSHIPv6ADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshIpv6Adapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
-
+ "Invalid port number or cache or timeout value in
configuration");
} catch (PerfSONARException e1) {

- logger.error("[CISCOSSHIPv6ADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshIpv6Adapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoSshIpv6Adapter] SshManager created: " + url + "
" + port);
+ logger.debug("[CiscoSshIpv6Adapter][takeAction] SshManager created:
" + url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -450,7 +441,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoSshIpv6Adapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -474,12 +465,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshIpv6Adapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshIpv6Adapter][takeAction]
Cached result removed");
it.remove();

}
@@ -510,12 +501,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -537,7 +528,7 @@

}

- logger.info("[CiscoSshIpv6Adapter] Command executed succesfully");
+ logger.info("[CiscoSshIpv6Adapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -546,7 +537,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoSshIpv6Adapter] Constructing response message");
+ logger.info("[CiscoSshIpv6Adapter][takeAction] Constructing response
message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperIpv6Adapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -85,13 +85,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERIPv6ADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperIpv6Adapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperIpv6Adapter] Constructor finished");
+ logger.info("[JuniperIpv6Adapter] Constructor finished");

}// JuniperIpv6Adapter

@@ -101,7 +101,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperIpv6Adapter getAvailableSpecificCommands
called");
+ logger.info("[JuniperIpv6Adapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -111,7 +111,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperIpv6Adapter setAvailableSpecificCommand
called");
+ logger.info("[JuniperIpv6Adapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -121,7 +121,7 @@
*/
public void addAvailableSpecificCommand(Ipv6CommandInterface command) {

- logger.debug("[JuniperIpv6Adapter addAvailableSpecificCommand
called");
+ logger.info("[JuniperIpv6Adapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -132,7 +132,7 @@
public Ipv6CommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperIpv6Adapter getCommand called");
+ logger.info("[JuniperIpv6Adapter] getCommand called");

Ipv6CommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -143,14 +143,14 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperIpv6Adapter Command found");
+ logger.debug("[JuniperIpv6Adapter] Command found: " +
command);
return command;

}

}// while

- logger.error("[JuniperIpv6Adapter Command NOT found");
+ logger.error("[JuniperIpv6Adapter] Command NOT found");
throw new PerfSONARException("error.mp.sshtelnet.nosuchcommand",
"Requested command not found");

@@ -160,7 +160,7 @@
*/
public Ipv6CommandInterface executeCommand(Ipv6CommandInterface command)
{

- logger.debug("[JuniperIpv6Adapter executeCommand called");
+ logger.info("[JuniperIpv6Adapter] executeCommand called");

if (manager != null) {

@@ -176,9 +176,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperIpv6Adapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperIpv6Adapter executeCommand finished");
+ logger.debug("[JuniperIpv6Adapter] executeCommand finished");
return command;

}// executeCommand
@@ -190,7 +190,7 @@
*/
public void connect(String subject) throws PerfSONARException {

- logger.debug("[JuniperIpv6Adapter Connect called");
+ logger.info("[JuniperIpv6Adapter] Connect called");

try {

@@ -209,16 +209,16 @@

}

- logger.debug("[JuniperIpv6Adapter Trying to connect");
+ logger.info("[JuniperIpv6Adapter][connect] Trying to connect");

manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.debug("[JuniperIpv6Adapter Login");
+ logger.info("[JuniperIpv6Adapter][connect] Login");

} catch (Exception e) {

- logger.error("[JuniperIpv6Adapter Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperIpv6Adapter][connect] Error occuring while
connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -270,7 +270,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperIpv6Adapter Configuring available operations
...");
+ logger.info("[JuniperIpv6Adapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -287,17 +287,16 @@
if (token.equals("IPv6_INTERFACE"))
command.setSuffix("extensive");
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperIpv6Adapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperIpv6Adapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -309,7 +308,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERIPv6ADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperIpv6Adapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -320,7 +319,7 @@
// this.addAvailableSpecificCommand(new
// Ipv6Command(ActionType.MP_IPv6_ROUTE, "show ipv6 route"));

- logger.debug("[JuniperIpv6Adapter Available operations configured");
+ logger.info("[JuniperIpv6Adapter] Available operations configured");

}

@@ -388,7 +387,7 @@
public Message takeAction(String actionType, Message request)
throws PerfSONARException {

- logger.info("[JuniperIpv6Adapter Webservice takeAction call
received");
+ logger.info("[JuniperIpv6Adapter] Webservice takeAction call
received");

Metadata[] metadata = request.getMetadataArray();
Subject s = metadata[0].getSubject();
@@ -396,14 +395,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperIpv6Adapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperIpv6Adapter][takeAction] EventTypeString: " +
eventTypeString);

JuniperIpv6Adapter adapter = new JuniperIpv6Adapter();

@@ -421,20 +420,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperIpv6Adapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperIpv6Adapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[JuniperIpv6Adapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[JuniperIpv6Adapter][takeAction] TelnetManager
created: " + url + " " + port);

try {

@@ -442,13 +442,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERIPv6ADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[JuniperIpv6Adapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

}

- logger.debug("[JuniperIpv6Adapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[JuniperIpv6Adapter][takeAction] Prompt set in
TelnetManager: " + prompt);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -466,7 +466,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperIpv6Adapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -490,12 +490,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -526,12 +526,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -553,7 +553,7 @@

}

- logger.info("[JuniperIpv6Adapter Command executed succesfully");
+ logger.info("[JuniperIpv6Adapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -562,7 +562,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperIpv6Adapter Constructing response message");
+ logger.info("[JuniperIpv6Adapter][takeAction] Constructing response
message");

Message response = new Message();

@@ -575,12 +575,10 @@
response.setMetadata(respMetaData[0]);
response.setData(respData[0]);

- logger.debug(respMetaData + "");
- logger.debug(respData + "");

// response.setSonarMetadata(request.getSonarMetadata());
// response.setSonarData(new Data[] { data });
- logger.info("[JuniperIpv6Adapter takeAction finished");
+ logger.info("[JuniperIpv6Adapter] takeAction finished");

return response;
// return new ServiceEngineResponse();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -88,13 +88,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYIPv6ADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpv6Adapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperKeyIpv6Adapter] Constructor finished");
+ logger.info("[JuniperKeyIpv6Adapter] Constructor finished");

}// JuniperKeyIpv6Adapter

@@ -104,7 +104,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperKeyIpv6Adapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperKeyIpv6Adapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -114,7 +114,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperKeyIpv6Adapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyIpv6Adapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -124,7 +124,7 @@
*/
public void addAvailableSpecificCommand(Ipv6CommandInterface command) {

- logger.debug("[JuniperKeyIpv6Adapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyIpv6Adapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -135,7 +135,7 @@
public Ipv6CommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperKeyIpv6Adapter] getCommand called");
+ logger.info("[JuniperKeyIpv6Adapter] getCommand called");

Ipv6CommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -146,7 +146,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperKeyIpv6Adapter] Command found");
+ logger.debug("[JuniperKeyIpv6Adapter] Command found: " +
command);
return command;

}
@@ -163,11 +163,10 @@
*/
public Ipv6CommandInterface executeCommand(Ipv6CommandInterface command)
{

- logger.debug("[JuniperKeyIpv6Adapter] executeCommand called");
+ logger.info("[JuniperKeyIpv6Adapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = "";
if (command.getSuffix() != null &&
!command.getSuffix().equals(""))
temp2 = manager.executeCommand(command.getCommand() +
" " + command.getParameterString() + " " + command.getSuffix());
@@ -178,9 +177,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperKeyIpv6Adapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[JuniperKeyIpv6Adapter] executeCommand finished");
return command;

}// executeCommand
@@ -212,19 +211,10 @@
else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}

- logger.info("[JuniperKeyIpv6Adapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- // manager.connect(username, keyUrl);
- //} else {
- // manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.info("[JuniperKeyIpv6Adapter] Login");
-
} catch (Exception e) {

- logger.error("[JuniperKeyIpv6Adapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpv6Adapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -276,7 +266,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperKeyIpv6Adapter] Configuring available
operations ...");
+ logger.info("[JuniperKeyIpv6Adapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -296,13 +286,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyIpv6Adapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyIpv6Adapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -314,13 +304,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYIPv6ADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyIpv6Adapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperKeyIpv6Adapter] Available operations
configured");
+ logger.info("[JuniperKeyIpv6Adapter] Available operations
configured");

}

@@ -402,14 +392,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperKeyIpv6Adapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperKeyIpv6Adapter][takeAction] EventTypeString: "
+ eventTypeString);

//JuniperKeyIpv6Adapter adapter = new JuniperKeyIpv6Adapter();

@@ -429,20 +419,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERKEYIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyIpv6Adapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERKEYIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyIpv6Adapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[JuniperKeyIpv6Adapter] TelnetManager created: " + url
+ " " + port);
+ logger.debug("[JuniperKeyIpv6Adapter][takeAction] SshKeyManager
created: " + url + " " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -460,7 +451,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperKeyIpv6Adapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -484,12 +475,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyIpv6Adapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyIpv6Adapter][takeAction]
Cached result removed");
it.remove();

}
@@ -520,12 +511,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -547,7 +538,7 @@

}

- logger.info("[JuniperKeyIpv6Adapter] Command executed succesfully");
+ logger.info("[JuniperKeyIpv6Adapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -558,7 +549,7 @@

datum.setDatum(filterResult(temp, ipv6Command));

- logger.info("[JuniperKeyIpv6Adapter] Constructing response message");
+ logger.info("[JuniperKeyIpv6Adapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -84,16 +84,14 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHIPv6ADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshIpv6Adapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperSshIpv6Adapter] Constructor started");
+ logger.info("[JuniperSshIpv6Adapter] Constructor finished");

- logger.debug("[JuniperSshIpv6Adapter] Constructor finished");
-
}// JuniperSshIpv6Adapter

// ---------------------- public methods
@@ -102,7 +100,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperSshIpv6Adapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperSshIpv6Adapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -112,7 +110,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperSshIpv6Adapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperSshIpv6Adapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -122,7 +120,7 @@
*/
public void addAvailableSpecificCommand(Ipv6CommandInterface command) {

- logger.debug("[JuniperSshIpv6Adapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperSshIpv6Adapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -133,7 +131,7 @@
public Ipv6CommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperSshIpv6Adapter] getCommand called");
+ logger.info("[JuniperSshIpv6Adapter] getCommand called");

Ipv6CommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -144,7 +142,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperSshIpv6Adapter] Command found");
+ logger.debug("[JuniperSshIpv6Adapter] Command found: " +
command);
return command;

}
@@ -161,7 +159,7 @@
*/
public Ipv6CommandInterface executeCommand(Ipv6CommandInterface command)
{

- logger.debug("[JuniperSshIpv6Adapter] executeCommand called");
+ logger.info("[JuniperSshIpv6Adapter] executeCommand called");

if (manager != null) {

@@ -175,7 +173,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperSshIpv6Adapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[JuniperSshIpv6Adapter] executeCommand finished");
return command;
@@ -210,16 +208,10 @@

}

- logger.info("[JuniperSshIpv6Adapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[JuniperSshIpv6Adapter Login");
-
} catch (Exception e) {

- logger.error("[JuniperSshIpv6Adapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperSshIpv6Adapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -271,7 +263,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperSshIpv6Adapter] Configuring available
operations ...");
+ logger.info("[JuniperSshIpv6Adapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -292,13 +284,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshIpv6Adapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHIPv6ADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshIpv6Adapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -310,13 +302,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHIPv6ADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshIpv6Adapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperSshIpv6Adapter] Available operations
configured");
+ logger.info("[JuniperSshIpv6Adapter] Available operations
configured");

}

@@ -398,14 +390,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperSshIpv6Adapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperSshIpv6Adapter][takeAction] EventTypeString: "
+ eventTypeString);

//JuniperSshIpv6Adapter adapter = new JuniperSshIpv6Adapter();

@@ -427,20 +419,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERSSHIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshIpv6Adapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERSSHIPv6ADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshIpv6Adapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] SshManager created: " + url + " "
+ port);
+ logger.debug("[CiscoStatusAdapter][takeAction] SshManager created: "
+ url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -460,7 +453,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperSshIpv6Adapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -484,12 +477,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshIpv6Adapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshIpv6Adapter][takeAction]
Cached result removed");
it.remove();

}
@@ -520,12 +513,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(ipv6Command.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(ipv6Command.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(ipv6Command.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshIpv6Adapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshIpv6Adapter][takeAction] Cached
result removed");
it.remove();

}
@@ -547,7 +540,7 @@

}

- logger.info("[JuniperSshIpv6Adapter] Command executed succesfully");
+ logger.info("[JuniperSshIpv6Adapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -556,7 +549,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperSshIpv6Adapter] Constructing response message");
+ logger.info("[JuniperSshIpv6Adapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -43,7 +43,7 @@

} catch (PerfSONARException e) {

- logger.error("[DBMETADATACONFIGURATION][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[DbMetadataConfiguration][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.common.no_logger",
"MetadataConfigurationStorageManager.constructor: " +
"Cannot get logger component");
@@ -56,7 +56,7 @@

} catch (PerfSONARException e) {

- logger.error("[DBMETADATACONFIGURATION][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[DbMetadataConfiguration][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.common.no_configuration",
"MetadataConfigurationStorageManager.constructor: " +
"Cannot get config component");
@@ -103,7 +103,7 @@
try {
object = this.existDbXmlStorageManager.fetch(query);
} catch (Exception ex) {
- logger.error("[DBMETADATACONFIGURATION][GetProperty]
MetadataConfigurationStorageManager.fetch: " + "Connection to xml database
failed: " + ex.toString());
+ logger.error("[DbMetadataConfiguration][GetProperty]
MetadataConfigurationStorageManager.fetch: " + "Connection to xml database
failed: " + ex.toString());
//ex.printStackTrace();
throw new PerfSONARException(
"error.common.storage.xmldb",
@@ -156,7 +156,7 @@
try {
object = this.existDbXmlStorageManager.fetch(query);
} catch (Exception ex) {
-
logger.error("[DBMETADATACONFIGURATION][GetProperty]MetadataConfigurationStorageManager.fetch:
" + "Connection to xml database failed: " + ex.toString());
+
logger.error("[DbMetadataConfiguration][GetProperty]MetadataConfigurationStorageManager.fetch:
" + "Connection to xml database failed: " + ex.toString());
//ex.printStackTrace();
throw new PerfSONARException(
"error.common.storage.xmldb",
@@ -203,7 +203,7 @@
try {
object = this.existDbXmlStorageManager.fetch(query);
} catch (Exception ex) {
-
logger.error("[DBMETADATACONFIGURATION][GetProperties]DbMetadataConfiguration.getProperties:
" + "Connection to xml database failed: " + ex.toString());
+
logger.error("[DbMetadataConfiguration][GetProperties]DbMetadataConfiguration.getProperties:
" + "Connection to xml database failed: " + ex.toString());
ex.printStackTrace();
throw new PerfSONARException(
"error.common.storage.xmldb",
@@ -269,7 +269,7 @@
try {
object = this.existDbXmlStorageManager.fetch(query);
} catch (Exception ex) {
-
logger.error("[DBMETADATACONFIGURATION][GetProperty]DbMetadataConfiguration.getProperties:
" + "Connection to xml database failed: " + ex.toString());
+
logger.error("[DbMetadataConfiguration][GetProperty]DbMetadataConfiguration.getProperties:
" + "Connection to xml database failed: " + ex.toString());
//ex.printStackTrace();
throw new PerfSONARException(
"error.common.storage.xmldb",
@@ -315,7 +315,7 @@
xmldbAccess =

configuration.getProperty("component.mp.xmldb.db_access");
} catch (Exception ex) {
- logger.error("[DBMETADATACONFIGURATION][GetStorageManager]" +
ex.getStackTrace().toString());
+ logger.error("[DbMetadataConfiguration][GetStorageManager]" +
ex.getStackTrace()[0].toString());
throw new PerfSONARException(
"warning.mp.metadata_configuration",
"DbMetadataConfiguration.getStorageManager: " +
"Something went wrong while reading the properties file");

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -88,13 +88,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOKEYSTATUSADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyStatusAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoKeyStatusAdapter] Constructor finished");
+ logger.info("[CiscoKeyStatusAdapter] Constructor finished");

}// CiscoKeyStatusAdapter

@@ -104,7 +104,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoKeyStatusAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoKeyStatusAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -114,7 +114,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoKeyStatusAdapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoKeyStatusAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -124,7 +124,7 @@
*/
public void addAvailableSpecificCommand(StatusCommandInterface command) {

- logger.debug("[CiscoKeyStatusAdapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoKeyStatusAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -135,7 +135,7 @@
public StatusCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoKeyStatusAdapter] getCommand called");
+ logger.info("[CiscoKeyStatusAdapter] getCommand called");

StatusCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -146,7 +146,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoKeyStatusAdapter] Command found");
+ logger.debug("[CiscoKeyStatusAdapter] Command found: "+
command);
return command;

}
@@ -163,11 +163,10 @@
*/
public StatusCommandInterface executeCommand(StatusCommandInterface
command) {

- logger.debug("[CiscoKeyStatusAdapter] executeCommand called");
+ logger.info("[CiscoKeyStatusAdapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());

manager.disconnect();
@@ -177,9 +176,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoKeyStatusAdapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[CiscoKeyStatusAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -211,19 +210,10 @@
else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}

- logger.info("[CiscoKeyStatusAdapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- // manager.connect(username, keyUrl);
- //} else {
- // manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.info("[CiscoKeyStatusAdapter] Login");
-
} catch (Exception e) {

logger.error("[CiscoKeyStatusAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -275,7 +265,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoKeyStatusAdapter] Configuring available
operations ...");
+ logger.info("[CiscoKeyStatusAdapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -293,13 +283,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOKEYSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoKeyStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOKEYSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoKeyStatusAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -311,13 +301,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOKEYSTATUSADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoKeyStatusAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoKeyStatusAdapter] Available operations
configured");
+ logger.info("[CiscoKeyStatusAdapter] Available operations
configured");

}

@@ -386,14 +376,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoKeyStatusAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoKeyStatusAdapter][takeAction] EventTypeString: "
+ eventTypeString);

//CiscoKeyStatusAdapter adapter = new CiscoKeyStatusAdapter();

@@ -413,20 +403,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOKEYSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyStatusAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOKEYSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoKeyStatusAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoKeyStatusAdapter] TelnetManager created: " + url
+ " " + port);
+ logger.debug("[CiscoKeyStatusAdapter] SshKeyManager created: " + url
+ " " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -444,7 +435,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoKeyStatusAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -468,12 +459,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoKeyStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoKeyStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -504,12 +495,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoKeyStatusAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoKeyStatusAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -531,7 +522,7 @@

}

- logger.info("[CiscoKeyStatusAdapter] Command executed succesfully");
+ logger.info("[CiscoKeyStatusAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -540,7 +531,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoKeyStatusAdapter] Constructing response message");
+ logger.info("[CiscoKeyStatusAdapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -93,16 +93,14 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHSTATUSADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshStatusAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoSshStatusAdapter] Constructor started");
+ logger.info("[CiscoSshStatusAdapter] Constructor finished");

- logger.debug("[CiscoSshStatusAdapter] Constructor finished");
-
}// CiscoSshStatusAdapter

// ---------------------- public methods
@@ -111,7 +109,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoSshStatusAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoSshStatusAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -121,7 +119,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoSshStatusAdapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoSshStatusAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -131,7 +129,7 @@
*/
public void addAvailableSpecificCommand(StatusCommandInterface command) {

- logger.debug("[CiscoSshStatusAdapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoSshStatusAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -142,7 +140,7 @@
public StatusCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoSshStatusAdapter] getCommand called");
+ logger.info("[CiscoSshStatusAdapter] getCommand called");

StatusCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -153,7 +151,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoSshStatusAdapter] Command found");
+ logger.debug("[CiscoSshStatusAdapter] Command found: " +
command);
return command;

}
@@ -170,7 +168,7 @@
*/
public StatusCommandInterface executeCommand(StatusCommandInterface
command) {

- logger.debug("[CiscoSshStatusAdapter] executeCommand called");
+ logger.info("[CiscoSshStatusAdapter] executeCommand called");

if (manager != null) {

@@ -180,7 +178,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoSshStatusAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[CiscoSshStatusAdapter] executeCommand finished");
return command;
@@ -216,16 +214,10 @@

}

- logger.info("[CiscoSshStatusAdapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[CiscoSshStatusAdapter Login");
-
} catch (Exception e) {

- logger.error("[CiscoSshStatusAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoSshStatusAdapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -277,7 +269,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoSshStatusAdapter] Configuring available
operations ...");
+ logger.info("[CiscoSshStatusAdapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -292,17 +284,16 @@

StatusCommand command = new StatusCommand(token,
properties.getProperty(subject, token, "command"));
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoSshStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSSHSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoSshStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -314,13 +305,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSSHSTATUSADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoSshStatusAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[CiscoSshStatusAdapter] Available operations
configured");
+ logger.info("[CiscoSshStatusAdapter] Available operations
configured");

}

@@ -389,14 +380,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoSshStatusAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoSshStatusAdapter][takeAction] EventTypeString: "
+ eventTypeString);

//CiscoSshStatusAdapter adapter = new CiscoSshStatusAdapter();

@@ -418,20 +409,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOSSHSTATUSADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshStatusAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOSSHSTATUSADAPTER][TakeAction]" +
e1.getStackTrace()[0].toString());
+ logger.error("[CiscoSshStatusAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] SshManager created: " + url + " "
+ port);
+ logger.debug("[CiscoStatusAdapter][takeAction] SshManager created: "
+ url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -451,7 +443,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoSshStatusAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -475,12 +467,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -511,12 +503,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoSshStatusAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoSshStatusAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -538,7 +530,7 @@

}

- logger.info("[CiscoSshStatusAdapter] Command executed succesfully");
+ logger.info("[CiscoSshStatusAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -547,7 +539,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoSshStatusAdapter] Constructing response message");
+ logger.info("[CiscoSshStatusAdapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoStatusAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -85,13 +85,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSTATUSADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[CiscoStatusAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[CiscoStatusAdapter] Constructor finished");
+ logger.info("[CiscoStatusAdapter] Constructor finished");

}// CiscoStatusAdapter

@@ -101,7 +101,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[CiscoStatusAdapter] getAvailableSpecificCommands
called");
+ logger.info("[CiscoStatusAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -113,7 +113,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[CiscoStatusAdapter] setAvailableSpecificCommand
called");
+ logger.info("[CiscoStatusAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -123,7 +123,7 @@
*/
public void addAvailableSpecificCommand(StatusCommandInterface command) {

- logger.debug("[CiscoStatusAdapter] addAvailableSpecificCommand
called");
+ logger.info("[CiscoStatusAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -134,7 +134,7 @@
public StatusCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[CiscoStatusAdapter] getCommand called");
+ logger.info("[CiscoStatusAdapter] getCommand called");

StatusCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -145,7 +145,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[CiscoStatusAdapter] Command found");
+ logger.debug("[CiscoStatusAdapter] Command found: " +
command);
return command;

}
@@ -162,7 +162,7 @@
*/
public StatusCommandInterface executeCommand(StatusCommandInterface
command) {

- logger.debug("[CiscoStatusAdapter] executeCommand called");
+ logger.info("[CiscoStatusAdapter] executeCommand called");

if (manager != null) {

@@ -174,7 +174,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[CiscoStatusAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[CiscoStatusAdapter] executeCommand finished");
return command;
@@ -188,7 +188,7 @@
*/
public void connect(String subject) throws PerfSONARException {

- logger.debug("[CiscoStatusAdapter] Connect called");
+ logger.info("[CiscoStatusAdapter] Connect called");

try {

@@ -212,16 +212,16 @@

}

- logger.debug("[CiscoStatusAdapter] Trying to connect");
+ logger.info("[CiscoStatusAdapter][connect] Trying to connect");

manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");

- logger.debug("[CiscoStatusAdapter] Login");
+ logger.info("[CiscoStatusAdapter][connect] Logged in");

} catch (Exception e) {

- logger.error("[CiscoStatusAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[CiscoStatusAdapter][connect] Error occuring while
connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -273,7 +273,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[CiscoStatusAdapter] Configuring available operations
...");
+ logger.info("[CiscoStatusAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -292,13 +292,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[CISCOSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[CiscoStatusAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -310,7 +310,7 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSTATUSADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[CiscoStatusAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -335,7 +335,7 @@
// this.addAvailableSpecificCommand(new
// StatusCommand(ActionType.MP_STATUS_INTERFACE, "show interface"));

- logger.debug("[CiscoStatusAdapter] Available operations configured");
+ logger.info("[CiscoStatusAdapter] Available operations configured");

}

@@ -409,12 +409,12 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[CiscoStatusAdapter][takeAction] SubjectString: " +
subject);

EventType eventType = metadata[0].getEventType();
String eventTypeString = eventType.getEventType();

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[CiscoStatusAdapter][takeAction] EventTypeString: " +
eventTypeString);

CiscoStatusAdapter adapter = new CiscoStatusAdapter();

@@ -434,20 +434,21 @@

} catch (NumberFormatException e1) {

- logger.error("[CISCOSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoStatusAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[CISCOSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[CiscoStatusAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] TelnetManager created: " + url +
" " + port);
+ logger.debug("[CiscoStatusAdapter][takeAction] TelnetManager
created: " + url + " " + port);

try {

@@ -455,13 +456,13 @@

} catch (PerfSONARException e) {

- logger.error("[CISCOSTATUSADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[CiscoStatusAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

}

- logger.debug("[CiscoStatusAdapter] Prompt set in TelnetManager: " +
prompt);
+ logger.debug("[CiscoStatusAdapter][takeAction] Prompt set in
TelnetManager: " + prompt);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -479,7 +480,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[CiscoStatusAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -503,12 +504,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoStatusAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoStatusAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -539,12 +540,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[CiscoStatusAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[CiscoStatusAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -566,7 +567,7 @@

}

- logger.info("[CiscoStatusAdapter] Command executed succesfully");
+ logger.info("[CiscoStatusAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -575,7 +576,7 @@
datum.setDatum(temp);
}

- logger.info("[CiscoStatusAdapter] Constructing response message");
+ logger.info("[CiscoStatusAdapter][takeAction] Constructing response
message");

Message response = new Message();

@@ -588,9 +589,6 @@
response.setMetadata(respMetaData[0]);
response.setData(respData[0]);

- logger.debug(respMetaData + "");
- logger.debug(respData + "");
-
// response.setSonarMetadata(request.getSonarMetadata());
// response.setSonarData(new Data[] { data });

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -88,13 +88,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYSTATUSADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyStatusAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperKeyStatusAdapter] Constructor finished");
+ logger.info("[JuniperKeyStatusAdapter] Constructor finished");

}// JuniperKeyStatusAdapter

@@ -104,7 +104,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperKeyStatusAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperKeyStatusAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -114,7 +114,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperKeyStatusAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyStatusAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -124,7 +124,7 @@
*/
public void addAvailableSpecificCommand(StatusCommandInterface command) {

- logger.debug("[JuniperKeyStatusAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperKeyStatusAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -135,7 +135,7 @@
public StatusCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperKeyStatusAdapter] getCommand called");
+ logger.info("[JuniperKeyStatusAdapter] getCommand called");

StatusCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -146,7 +146,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperKeyStatusAdapter] Command found");
+ logger.debug("[JuniperKeyStatusAdapter] Command found: " +
command);
return command;

}
@@ -163,11 +163,10 @@
*/
public StatusCommandInterface executeCommand(StatusCommandInterface
command) {

- logger.debug("[JuniperKeyStatusAdapter] executeCommand called");
+ logger.info("[JuniperKeyStatusAdapter] executeCommand called");

if (manager != null) {

- logger.debug("Executing command");
String temp2 = manager.executeCommand(command.getCommand() + " "
+ command.getParameterString());

manager.disconnect();
@@ -177,9 +176,9 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperKeyStatusAdapter][executeCommand] New result
returned");
cachedResults.add(command);
- logger.debug("[JuniperStatusAdapter] executeCommand finished");
+ logger.debug("[JuniperKeyStatusAdapter] executeCommand finished");
return command;

}// executeCommand
@@ -211,19 +210,10 @@
else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}

- logger.info("[JuniperKeyStatusAdapter] Trying to connect");
-
- //if (passphrase == null || passphrase.equals("")) {
- // manager.connect(username, keyUrl);
- //} else {
- // manager.connect(username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase));
- //}
- logger.info("[JuniperKeyStatusAdapter] Login");
-
} catch (Exception e) {

logger.error("[JuniperKeyStatusAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -275,7 +265,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperKeyStatusAdapter] Configuring available
operations ...");
+ logger.info("[JuniperKeyStatusAdapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -293,13 +283,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERKEYSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperKeyStatusAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -311,13 +301,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERKEYSTATUSADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperKeyStatusAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperKeyStatusAdapter] Available operations
configured");
+ logger.info("[JuniperKeyStatusAdapter] Available operations
configured");

}

@@ -400,14 +390,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperKeyStatusAdapter][takeAction] SubjectString: "
+ subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperKeyStatusAdapter][takeAction] EventTypeString:
" + eventTypeString);

//JuniperKeyStatusAdapter adapter = new JuniperKeyStatusAdapter();

@@ -427,20 +417,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERKEYSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyStatusAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERKEYSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperKeyStatusAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[JuniperKeyStatusAdapter] TelnetManager created: " +
url + " " + port);
+ logger.debug("[JuniperKeyStatusAdapter][takeAction] SshKeyManager
created: " + url + " " + port);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -458,7 +449,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperKeyStatusAdapter][takeAction]
Parameter value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -482,12 +473,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -518,12 +509,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperKeyStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperKeyStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -545,7 +536,7 @@

}

- logger.info("[JuniperKeyStatusAdapter] Command executed
succesfully");
+ logger.info("[JuniperKeyStatusAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -554,7 +545,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperKeyStatusAdapter] Constructing response
message");
+ logger.info("[JuniperKeyStatusAdapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -84,16 +84,14 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHSTATUSADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshStatusAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshYE.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperSshStatusAdapter] Constructor started");
+ logger.info("[JuniperSshStatusAdapter] Constructor finished");

- logger.debug("[JuniperSshStatusAdapter] Constructor finished");
-
}// JuniperSshStatusAdapter

// ---------------------- public methods
@@ -102,7 +100,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperSshStatusAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperSshStatusAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -112,7 +110,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperSshStatusAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperSshStatusAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -122,7 +120,7 @@
*/
public void addAvailableSpecificCommand(StatusCommandInterface command) {

- logger.debug("[JuniperSshStatusAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperSshStatusAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -133,7 +131,7 @@
public StatusCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperSshStatusAdapter] getCommand called");
+ logger.info("[JuniperSshStatusAdapter] getCommand called");

StatusCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -144,7 +142,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperSshStatusAdapter] Command found");
+ logger.debug("[JuniperSshStatusAdapter] Command found: " +
command);
return command;

}
@@ -161,7 +159,7 @@
*/
public StatusCommandInterface executeCommand(StatusCommandInterface
command) {

- logger.debug("[JuniperSshStatusAdapter] executeCommand called");
+ logger.info("[JuniperSshStatusAdapter] executeCommand called");

if (manager != null) {

@@ -171,7 +169,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperSshStatusAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[JuniperSshStatusAdapter] executeCommand finished");
return command;
@@ -206,16 +204,10 @@

}

- logger.info("[JuniperSshStatusAdapter] Trying to connect");
-
- //manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
-
- logger.info("[JuniperSshStatusAdapter Login");
-
} catch (Exception e) {

logger.error("[JuniperSshStatusAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -267,7 +259,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperSshStatusAdapter] Configuring available
operations ...");
+ logger.info("[JuniperSshStatusAdapter] Configuring available
operations ...");

Iterator commands = null;
String token = null;
@@ -282,17 +274,16 @@

StatusCommand command = new StatusCommand(token,
properties.getProperty(subject, token, "command"));
try {
- logger.debug("service.mp." + subject + ".commands."
+ token + ".minParamCount");
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSSHSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperSshStatusAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -304,13 +295,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSSHSTATUSADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperSshStatusAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

}

- logger.debug("[JuniperSshStatusAdapter] Available operations
configured");
+ logger.info("[JuniperSshStatusAdapter] Available operations
configured");

}

@@ -392,14 +383,14 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperSshStatusAdapter][takeAction] SubjectString: "
+ subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperSshStatusAdapter][takeAction] EventString: " +
eventTypeString);

//JuniperSshStatusAdapter adapter = new JuniperSshStatusAdapter();

@@ -421,20 +412,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERSSHSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshStatusAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERSSHSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperSshStatusAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[CiscoStatusAdapter] SshManager created: " + url + " "
+ port);
+ logger.debug("[CiscoStatusAdapter][takeAction] SshManager created: "
+ url + " " + port);

//This private method call will include all supported methods
//that can be performed on the remote device
@@ -454,7 +446,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperSshStatusAdapter][takeAction]
Parameter value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -478,12 +470,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -514,12 +506,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperSshStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperSshStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -541,7 +533,7 @@

}

- logger.info("[JuniperSshStatusAdapter] Command executed
succesfully");
+ logger.info("[JuniperSshStatusAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -550,7 +542,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperSshStatusAdapter] Constructing response
message");
+ logger.info("[JuniperSshStatusAdapter][takeAction] Constructing
response message");

Message response = new Message();

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperStatusAdapter.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -85,13 +85,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSTATUSADAPTER][Constructor]" +
e.getStackTrace().toString());
+ logger.error("[JuniperStatusAdapter][Constructor]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");

}

- logger.debug("[JuniperStatusAdapter] Constructor finished");
+ logger.info("[JuniperStatusAdapter] Constructor finished");

}// JuniperStatusAdapter

@@ -101,7 +101,7 @@
*/
public List getAvailableSpecificCommands() {

- logger.debug("[JuniperStatusAdapter] getAvailableSpecificCommands
called");
+ logger.info("[JuniperStatusAdapter] getAvailableSpecificCommands
called");

return availableSpecificCommands;

@@ -113,7 +113,7 @@
*/
public void setAvailableSpecificCommands(List availableSpecificCommands)
{

- logger.debug("[JuniperStatusAdapter] setAvailableSpecificCommand
called");
+ logger.info("[JuniperStatusAdapter] setAvailableSpecificCommand
called");

this.availableSpecificCommands = availableSpecificCommands;

@@ -123,7 +123,7 @@
*/
public void addAvailableSpecificCommand(StatusCommandInterface command) {

- logger.debug("[JuniperStatusAdapter] addAvailableSpecificCommand
called");
+ logger.info("[JuniperStatusAdapter] addAvailableSpecificCommand
called");

availableSpecificCommands.add(command);

@@ -134,7 +134,7 @@
public StatusCommandInterface getCommand(String description)
throws PerfSONARException {

- logger.debug("[JuniperStatusAdapter] getCommand called");
+ logger.info("[JuniperStatusAdapter] getCommand called");

StatusCommandInterface command = null;
Iterator it = availableSpecificCommands.iterator();
@@ -145,7 +145,7 @@

if (command.getDescription().equalsIgnoreCase(description)) {

- logger.debug("[JuniperStatusAdapter] Command found");
+ logger.debug("[JuniperStatusAdapter] Command found: " +
command);
return command;

}
@@ -162,7 +162,7 @@
*/
public StatusCommandInterface executeCommand(StatusCommandInterface
command) {

- logger.debug("[JuniperStatusAdapter] executeCommand called");
+ logger.info("[JuniperStatusAdapter] executeCommand called");

if (manager != null) {

@@ -175,7 +175,7 @@

}// if

- logger.info("NEW RESULT RETURNED");
+ logger.info("[JuniperStatusAdapter][executeCommand] New result
returned");
cachedResults.add(command);
logger.debug("[JuniperStatusAdapter] executeCommand finished");
return command;
@@ -189,7 +189,7 @@
*/
public void connect(String subject) throws PerfSONARException {

- logger.debug("[JuniperStatusAdapter] Connect called");
+ logger.info("[JuniperStatusAdapter] Connect called");

try {

@@ -208,15 +208,15 @@

}

- logger.debug("[JuniperStatusAdapter] Trying to connect");
+ logger.info("[JuniperStatusAdapter][connect] Trying to connect");

manager.connect(username, "login:",
PasswordEncryptor.decryptPassword(password), "Password:");
- logger.debug("[JuniperStatusAdapter] Login");
+ logger.info("[JuniperStatusAdapter][connect] Logged in");

} catch (Exception e) {

- logger.error("[JuniperStatusAdapter] Error occuring while
connecting");
- logger.error(e.getStackTrace().toString());
+ logger.error("[JuniperStatusAdapter][connect] Error occuring
while connecting");
+ logger.error(e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");

@@ -268,7 +268,7 @@
*/
private void configureCommands(String subject) throws PerfSONARException
{

- logger.debug("[JuniperStatusAdapter] Configuring available
operations ...");
+ logger.info("[JuniperStatusAdapter] Configuring available operations
...");

Iterator commands = null;
String token = null;
@@ -288,13 +288,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperStatusAdapter][ConfigureCommands] MinParamCount not
found: " + e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
-
logger.error("[JUNIPERSTATUSADAPTER][ConfigureCommands]" +
e1.getStackTrace().toString());
+
logger.error("[JuniperStatusAdapter][ConfigureCommands] MaxParamCount not
found: " + e1.getStackTrace()[0].toString());
}

command.setDeviceName(subject);
@@ -306,7 +306,7 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSTATUSADAPTER][ConfigureCommands]" +
e.getStackTrace().toString());
+ logger.error("[JuniperStatusAdapter][ConfigureCommands]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");

@@ -331,7 +331,7 @@
// this.addAvailableSpecificCommand(new
// StatusCommand(ActionType.MP_STATUS_INTERFACE, "show interface"));

- logger.debug("[JuniperStatusAdapter] Available operations
configured");
+ logger.info("[JuniperStatusAdapter] Available operations
configured");

}

@@ -409,13 +409,13 @@
EndPoint endpoint = (EndPoint) s.getChildArray()[0];
String subject = endpoint.getValue();

- logger.debug("SUBJECTSTRING: " + subject);
+ logger.debug("[JuniperStatusAdapter][takeAction] SubjectString: " +
subject);

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

- logger.debug("EVENTTYPESTRING: " + eventTypeString);
+ logger.debug("[JuniperStatusAdapter][takeAction] EventString: " +
eventTypeString);

JuniperStatusAdapter adapter = new JuniperStatusAdapter();

@@ -433,20 +433,21 @@

} catch (NumberFormatException e1) {

- logger.error("[JUNIPERSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperStatusAdapter][TakeAction] One of the
numbers in the metadata " +
+ "configuration file is not parsable: " +
e1.getStackTrace()[0].toString());
throw new PerfSONARException(
"error.mp.sshtelnet.configuration",
- "Invalid port number in configuration");
+ "Invalid port number or cache or timeout value in
configuration");

} catch (PerfSONARException e1) {

- logger.error("[JUNIPERSTATUSADAPTER][TakeAction]" +
e1.getStackTrace().toString());
+ logger.error("[JuniperStatusAdapter][TakeAction]" +
e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");

}

- logger.debug("[JuniperStatusAdapter] TelnetManager created: " + url
+ " " + port);
+ logger.debug("[JuniperStatusAdapter][takeAction] TelnetManager
created: " + url + " " + port);

try {

@@ -454,13 +455,13 @@

} catch (PerfSONARException e) {

- logger.error("[JUNIPERSTATUSADAPTER][TakeAction]" +
e.getStackTrace().toString());
+ logger.error("[JuniperStatusAdapter][TakeAction]" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");

}

- logger.debug("[JuniperStatusAdapter] Prompt set in TelnetManager: "
+ prompt);
+ logger.debug("[JuniperStatusAdapter][takeAction] Prompt set in
TelnetManager: " + prompt);

// This private method call will include all supported methods
// that can be performed on the remote device
@@ -478,7 +479,7 @@

Parameter param = parametersArray[i];
String parameter = param.getParameterValue();
- logger.debug("PARAMETERVALUE: " + parameter);
+ logger.debug("[JuniperStatusAdapter][takeAction] Parameter
value: " + parameter);

if (new ParameterChecker().checkParam(subject,
eventTypeString,
parameter)) {
@@ -502,12 +503,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperStatusAdapter][takeAction]
Cached result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching *
1000) <= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperStatusAdapter][takeAction]
Cached result removed");
it.remove();

}
@@ -538,12 +539,12 @@

if
(cachedCommand.getCommand().equalsIgnoreCase(statusCommand.getCommand()) &&
cachedCommand.getParameterString().equalsIgnoreCase(statusCommand.getParameterString())
&&
cachedCommand.getDeviceName().equalsIgnoreCase(statusCommand.getDeviceName())
&& cachedCommand.getTimestamp() + (caching * 1000) >
System.currentTimeMillis()) {

- logger.info("CACHED RESULT RETURNED");
+ logger.info("[JuniperStatusAdapter][takeAction] Cached
result returned");
temp = cachedCommand.getResult();

} else if (cachedCommand.getTimestamp() + (caching * 1000)
<= System.currentTimeMillis()) {

- logger.info("CACHED RESULT REMOVED");
+ logger.info("[JuniperStatusAdapter][takeAction] Cached
result removed");
it.remove();

}
@@ -565,7 +566,7 @@

}

- logger.info("[JuniperStatusAdapter] Command executed succesfully");
+ logger.info("[JuniperStatusAdapter][takeAction] Command executed
succesfully");

Datum datum = new Datum();
if (valid) {
@@ -574,7 +575,7 @@
datum.setDatum(temp);
}

- logger.info("[JuniperStatusAdapter] Constructing response message");
+ logger.info("[JuniperStatusAdapter][takeAction] Constructing
response message");

Message response = new Message();

@@ -587,10 +588,7 @@
response.setMetadata(respMetaData[0]);
response.setData(respData[0]);

- logger.debug(respMetaData + "");
- logger.debug(respData + "");
-
- // response.setSonarMetadata(request.getSonarMetadata());
+ // response.setSonarMetadata(request.getSonarMetadata());
// response.setSonarData(new Data[] { data });

logger.info("[JuniperStatusAdapter] takeAction finished");

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -70,7 +70,7 @@

} catch (PerfSONARException e1) {

- logger.error("[SSHMANAGER][Constructor]" +
e1.getStackTrace().toString());
+ logger.error("[SshManager][Constructor]" +
e1.getStackTrace()[0].toString());

}

@@ -118,7 +118,7 @@

} catch (JSchException e) {

- logger.error("[SSHMANAGER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[SshManager][Connect]" +
e.getStackTrace()[0].toString());

}
}// connect
@@ -151,7 +151,7 @@

} catch (JSchException e) {

- logger.error("[SSHMANAGER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[SshManager][Connect]" +
e.getStackTrace()[0].toString());

}
}// connect
@@ -174,7 +174,7 @@

} catch (JSchException e) {

- logger.error("[SSHMANAGER][GetSshChannel]" +
e.getStackTrace().toString());
+ logger.error("[SshManager][GetSshChannel]" +
e.getStackTrace()[0].toString());
return null;
}

Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-10-13 14:26:38 UTC (rev 4610)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-10-13 14:31:11 UTC (rev 4611)
@@ -353,18 +353,23 @@
WizardProperties existProperties =
groupedProperties.get("eXist");
Iterator it = existProperties.orderedKeys();

- // Get all other parameters regarding exist in the users
reqauest
+
while (it.hasNext()) {
- String key = (String) it.next();
+
+ String key = (String) it.next();
// Get the parameter
String value = request.getParameter(key).trim();
// Get the property
+
WizardProperty pr =
existProperties.getWizardProperty(key);
// Set value and proposed value
pr.setPropertyValue(value);
- pr.setProposedValue(value);
+ if (!pr.getCheck()) {
+ pr.setProposedValue(value);
+ }
// Set the property in the exist group properties
existProperties.setWizardProperty(key, pr);
+
}
// Update the exist group Property
groupedProperties.put("eXist", existProperties);
@@ -376,11 +381,12 @@
} catch (Exception e) {
// Set doen to false if anything happens
done = false;
- throw new Exception(getFault(e));
+ e.printStackTrace();
+ throw new Exception(e.getMessage());
}
return done;
}
-
+
/**
* Method for handling all configuration actions regarding any other
group
* besides LS and eXist
@@ -583,7 +589,7 @@
* The Wizard Properties associated with the exist group
* @throws Exception
*/
- private void existActions(WizardProperties finalProperties)
+ /*private void existActions(WizardProperties finalProperties)
throws Exception {
//System.out.println("existActions("+finalProperties+")
called");

@@ -727,9 +733,193 @@
e.printStackTrace();
}

- }
+ }*/

/**
+ * Method used for handling all actions associated with exist db
+ * confoguration
+ *
+ * @param finalProperties
+ * The Wizard Properties associated with the exist group
+ * @throws Exception
+ */
+ private void existActions(WizardProperties finalProperties)
+ throws Exception {
+
+ // Changes happen into the service.property file that uses
groupig and
+ // description in order to keep that functionality we need in
this case
+ // to use the PerfsonarProperties class
+ PerfsonarProperties serviceProperties = new
PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new
FileInputStream(ServicePath
+ + ServicePropertiesPath));
+ // Any changes happening to the URL of the exist db and on
the admin
+ // password should be reflected on the servlet.properties as
well
+ ServiceProperties servletProperties = new
ServicePropertiesImpl(
+ ServicePath + ServletPropertiesPath);
+ // Get an iterator for all service properties
+ Iterator it = serviceProperties.getKeysIterator();
+ // Get the type of the service. Will be used for making the
new db
+ // collection
+ String serviceName = servletProperties.getProperty(
+ "servlet.service_type").trim();
+ // Naming the new collection on exist db
+ String dbCollection = serviceName + "config";
+ // Initializing all necessary fileds
+ String adminPass = null;
+ String existURI = "";
+ String newAdminPass = null;
+ String username = null;
+ String password = null;
+ String confFile = null;
+ String old_adminPass = null;
+ String old_adminPass1 = null;
+ String new_adminPassConfirm = null;
+ String createUser = null;
+ String changePass = null;
+ // Need to get the new xmlDBURI and old and new admin
password so that
+ // we can make the changes
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ if (key.endsWith("xmldb.db_uri")) {
+ existURI = finalProperties.getProperty(key);
+ }
+
+ }
+
+ it = finalProperties.orderedKeys();
+ // Iterating though tthe users input
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ // The input from the user is also set in service
properties with a
+ // slight modification for tyhe xmldb uri. We need to
add the
+ // collection at the end of the URI
+ PerfsonarProperty property = new PerfsonarProperty();
+
+ if (!key.endsWith("xmldb.db_uri")) {
+
+ if (key.equals("create_user")) {
+
+ createUser =
finalProperties.getProperty(key).trim();
+
+ }
+
+ else if (key.equals("old_adminpassword_1")) {
+
+ old_adminPass1 =
finalProperties.getProperty(key).trim();
+
+ }
+
+ else if (key.equals("change_admin_pass")) {
+
+ changePass =
finalProperties.getProperty(key).trim();
+
+ } else if
(key.endsWith("xmldb.db_adminpassword_confirm")) {
+
+ new_adminPassConfirm =
finalProperties.getProperty(key)
+ .trim();
+
+ } else if (key.equals("old_adminpassword")) {
+
+ old_adminPass =
finalProperties.getProperty(key).trim();
+
+ } else {
+
+ property =
serviceProperties.getProperty(key);
+ // If property key does not exist
throw an exceptrion
+ if (property == null) {
+ throw new Exception("Key is
invalid " + key + " ");
+ } else {
+
if(!key.endsWith("xmldb.db_adminpassword")||(finalProperties.getProperty("change_admin_pass").equals("yes"))){
+
property.setValue(finalProperties.getProperty(key));
+
serviceProperties.setProperty(key, property);
+ }
+ }
+ }
+ } else {
+
+ property = serviceProperties.getProperty(key);
+ property.setValue(existURI);
+ serviceProperties.setProperty(key, property);
+
+ }
+ // Setting also the wizard properties
+
+ properties.setWizardProperty(key,
finalProperties
+ .getWizardProperty(key));
+
+
+ // Also getting all needed information in orer to
configure the
+ // exist db
+ if (key.endsWith("xmldb.db_username")) {
+ username =
finalProperties.getProperty(key).trim();
+ }
+ if (key.endsWith("xmldb.db_password")) {
+ password =
finalProperties.getProperty(key).trim();
+ }
+ if (key.endsWith("xmldb.metadata_file_path")) {
+ confFile =
finalProperties.getProperty(key).trim();
+ }
+ if (key.endsWith("xmldb.db_adminpassword")) {
+
+ newAdminPass =
finalProperties.getProperty(key).trim();
+ }
+
+ }
+
+ // If admin pass is not set than its considered to be empty
+ if (adminPass == null) {
+ adminPass = "";
+ }
+
+ // Creating all necessary collections and users in exist
+ if (existURI == null) {
+ throw new Exception("eXist xmldb URI is empty!\n");
+ } else {
+ if (existURI.endsWith("/db"))
+ existURI = existURI.substring(0,
existURI.length()-"/db".length());
+
+ if (createUser.equals("yes")) {
+
+ xmlDBManager manager = new
xmlDBManagerImpl(existURI, "admin",
+ old_adminPass1);
+ // Creating collection and users
+ //manager.createCollection(dbCollection); //
we do not use a collection
+ String[] groups = {"dba"};
+ manager.createUser(null, username, password,
groups);
+ // Adding the metadata config document
+ manager.getCollection(null).addDocument(
+ new File(confFile), username);
+ } else {
+ xmlDBManager manager = new
xmlDBManagerImpl(existURI, username,
+ password);
+ // Creating collection and users
+ //manager.createCollection(dbCollection); //
we do not use a collection
+ // Adding the metadata config document
+ manager.getCollection(null).addDocument(
+ new File(confFile), username);
+ }
+ // Modifying the admin user password
+ if (changePass.equals("yes")) {
+ if
(newAdminPass.equals(new_adminPassConfirm)) {
+
+ xmlDBManager manager = new
xmlDBManagerImpl(existURI,
+ "admin",
old_adminPass);
+ manager.modifyUser("admin",
newAdminPass, null, null);
+ } else {
+ throw new Exception(
+ "New eXist Admin
passwords don't match.Please re-enter passwords.");
+ }
+ }
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));
+ properties.storeToXML(new FileOutputStream(new
File(ServicePath
+ + WizardPropertiesPath)), " Last
Modification "
+ +
Calendar.getInstance().getTime().toString());
+ }
+
+ }
+
+ /**
* Method used for adding registration componenets to the
* componenets.properties file
*

perfsonar: r4611 - in branches/geant2_java-sshtelnet-mp-RELEASE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics contrib/metadata_configuration_tools/CSV_Generator_script/conf contrib/metadata_configuration_tools/Configuration_Tool/conf doc packaging packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/encryption src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/mea surementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin, svnlog, 10/13/2008

List archive