perfsonar-dev - perfsonar: r5097 - in branches/geant2_java-sshtelnet-mp-RELEASE: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin
Subject: perfsonar development work
List archive
perfsonar: r5097 - in branches/geant2_java-sshtelnet-mp-RELEASE: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5097 - in branches/geant2_java-sshtelnet-mp-RELEASE: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin
- Date: Fri, 27 Mar 2009 11:45:14 -0400
Author: melis
Date: 2009-03-27 11:45:14 -0400 (Fri, 27 Mar 2009)
New Revision: 5097
Modified:
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/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
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/packaging/deb/changelog
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/rules
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/bgp/adapters/CiscoBgpAdapter.java
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/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/engine/adapters/WebserviceEngineAdapter.java
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.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/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/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/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/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/remote/ssh/MyUserInfo.java
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.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:
updated everything in the RELEASE branch to version 1.3.4.1
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
2009-03-27 15:45:14 UTC (rev 5097)
@@ -11,7 +11,7 @@
service.name=ps-mdm-sshtelnet-mp
jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4
+version=1.3.4.1
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
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
2009-03-27 15:45:14 UTC (rev 5097)
@@ -11,7 +11,7 @@
service.name=ps-mdm-sshtelnet-mp
jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4
+version=1.3.4.1
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/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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
2009-03-27 15:45:14 UTC (rev 5097)
@@ -84,7 +84,7 @@
# Group=LS
# Description=The version number of the service.
-service.r.service_version=1.3.4
+service.r.service_version=1.3.4.1
# Group=LS
# Description=The email address of the person who manages the service.
@@ -110,6 +110,10 @@
# 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.
service.ma.conf_file.store_type=xmldb
+# Group=LS
+# Description=Enter the content type of the service
+service.ls.service_content_type=sshtelnet mp
+
#Authentication properties
#-------------------------
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
2009-03-27 15:45:14 UTC (rev 5097)
@@ -84,7 +84,7 @@
# Group=LS
# Description=The version number of the service.
-service.r.service_version=1.3.4
+service.r.service_version=1.3.4.1
# Group=LS
# Description=The email address of the person who manages the service.
@@ -110,6 +110,10 @@
# 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.
service.ma.conf_file.store_type=xmldb
+# Group=LS
+# Description=Enter the content type of the service
+service.ls.service_content_type=sshtelnet mp
+
#Authentication properties
#-------------------------
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
2009-03-27 15:45:14 UTC (rev 5097)
@@ -84,7 +84,7 @@
# Group=LS
# Description=The version number of the service.
-service.r.service_version=1.3.4
+service.r.service_version=1.3.4.1
# Group=LS
# Description=The email address of the person who manages the service.
@@ -110,6 +110,10 @@
# 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.
service.ma.conf_file.store_type=xmldb
+# Group=LS
+# Description=Enter the content type of the service
+service.ls.service_content_type=sshtelnet mp
+
#Authentication properties
#-------------------------
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/changelog
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/changelog
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/changelog
2009-03-27 15:45:14 UTC (rev 5097)
@@ -1,3 +1,13 @@
+ps-mdm-sshtelnet-mp (1.3.4.1) stable; urgency=low
+
+ * ps-base version: 1.0.200800902
+ * web-admin version: 0.9.3c
+ * Fixed problem with StrictHostKeyChecking
+ * Fixed LS registration problem
+ * Fixed bug when no devices are configured
+
+ -- Stijn Melis
<>
Thu, 26 Mar 2009 12:12:48 +0200
+
ps-mdm-sshtelnet-mp (1.3.4) stable; urgency=low
* ps-base version: 1.0.20080902
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/docs
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/docs
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/docs
2009-03-27 15:45:14 UTC (rev 5097)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4/doc/*
\ No newline at end of file
+ps-mdm-sshtelnet-mp-1.3.4.1/doc/*
\ No newline at end of file
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/files
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/files
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/files
2009-03-27 15:45:14 UTC (rev 5097)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp_1.3.4_all.deb web extra
+ps-mdm-sshtelnet-mp_1.3.4.1_all.deb web extra
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/install
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/install
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/install
2009-03-27 15:45:14 UTC (rev 5097)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/*
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+ps-mdm-sshtelnet-mp-1.3.4.1/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/*
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
Modified: branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/rules
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/rules
2009-03-27 15:43:33 UTC (rev 5096)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/packaging/deb/rules
2009-03-27 15:45:14 UTC (rev 5097)
@@ -17,7 +17,7 @@
build-stamp: configure-stamp
dh_testdir
- ant -f ps-mdm-sshtelnet-mp-1.3.4/ant/build.xml webapp-package-create
+ ant -f ps-mdm-sshtelnet-mp-1.3.4.1/ant/build.xml webapp-package-create
touch $@
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
2009-03-27 15:45:14 UTC (rev 5097)
@@ -6,7 +6,7 @@
Name: ps-mdm-sshtelnet-mp
# Version of the microrelease
-Version: 1.3.4
+Version: 1.3.4.1
License: Modified BSD License
# Package version. Increment if you create a new package of same microrelease
@@ -134,6 +134,13 @@
%changelog
+* Tue Jan 13 2009 Stijn Melis
<>
1.3.4.1
+- ps-base version: 1.0.200800902
+- web-admin version: 0.9.3c
+- Fixed problem with StrictHostKeyChecking
+- Fixed LS registration problem
+- Fixed bug when no devices are configured
+
* Tue Jan 13 2009 Stijn Melis
<>
1.3.4
- ps-base version: 1.0.20080902
- web-admin version: 0.9.3c
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoBgpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -84,7 +84,7 @@
availableSpecificCommands = new ArrayList();
} catch (PerfSONARException e) {
-
+ logger.error("[CiscoBgpAdapter][Constructor]"+e.getMessage());
logger.error("[CiscoBgpAdapter][Constructor]"+e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
@@ -219,7 +219,7 @@
} catch (Exception e) {
logger.error("[CiscoBgpAdapter][Connect] Error occuring while
connecting");
- logger.error(e.getStackTrace()[0].toString());
+ logger.error(e.getMessage() + " " +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");
@@ -289,13 +289,13 @@
int minParamCount =
Integer.parseInt(properties.getProperty(subject, token, "minParamCount"));
command.setMinParamCount(minParamCount);
} catch (PerfSONARException e1) {
- logger.error("[CiscoBgpAdapter][ConfigureCommands]
MinParamCount not found: "+e1.getStackTrace()[0].toString());
+ logger.error("[CiscoBgpAdapter][ConfigureCommands]
MinParamCount not found: "+e1.getMessage() + ":" +
e1.getStackTrace()[0].toString());
}
try {
int maxParamCount =
Integer.parseInt(properties.getProperty(subject, token, "maxParamCount"));
command.setMaxParamCount(maxParamCount);
} catch (PerfSONARException e1) {
- logger.error("[CiscoBgpAdapter][ConfigureCommands]
MaxParamCount not found: "+e1.getStackTrace()[0].toString());
+ logger.error("[CiscoBgpAdapter][ConfigureCommands]
MaxParamCount not found: "+e1.getMessage() + ":" +
e1.getStackTrace()[0].toString());
}
command.setDeviceName(subject);
@@ -307,7 +307,7 @@
} catch (PerfSONARException e) {
- logger.error("[CiscoBgpAdapter][ConfigureCommands] Unable to
retrieve commands: "+e.getStackTrace()[0].toString());
+ logger.error("[CiscoBgpAdapter][ConfigureCommands] Unable to
retrieve commands: "+e.getMessage() + ":" + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve commands");
@@ -408,14 +408,14 @@
} catch (NumberFormatException e1) {
logger.error("[CiscoBgpAdapter][takeAction] One of the numbers
in the metadata" +
- " configuration file is not parsable:
"+e1.getStackTrace()[0].toString());
+ " configuration file is not parsable:
"+e1.getMessage() + ":" + 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("[CiscoBgpAdapter][takeAction]"+e1.getStackTrace()[0].toString());
+ logger.error("[CiscoBgpAdapter][takeAction]"+e1.getMessage() +
":" + e1.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve connection details");
@@ -429,7 +429,7 @@
} catch (PerfSONARException e) {
- logger.error("[CiscoBgpAdapter][takeAction] Unable to retrieve
prompt: "+e.getStackTrace()[0].toString());
+ logger.error("[CiscoBgpAdapter][takeAction] Unable to retrieve
prompt: "+e.getMessage() + ":" + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Unable to retrieve prompt");
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -86,7 +86,7 @@
} catch (PerfSONARException e) {
- logger.error("[CiscoKeyBgpAdapter][Constructor]" +
e.getStackTrace()[0].toString());
+ logger.error("[CiscoKeyBgpAdapter][Constructor]"+e.getMessage()
+ ":" + e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.configuration",
"Failed to obtain reference to the properties and/or
logger instances.");
@@ -202,14 +202,14 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals("")) {
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- } else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ } else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
} catch (Exception e) {
logger.error("[CiscoKeyBgpAdapter][Connect] Error occuring while
connecting");
- logger.error(e.getStackTrace()[0].toString());
+ logger.error(e.getMessage() + ":" +
e.getStackTrace()[0].toString());
throw new PerfSONARException("error.mp.sshtelnet.connect",
"Could not connect to underlying device");
}
@@ -393,7 +393,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoSshBgpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -198,7 +198,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -394,7 +394,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -199,8 +199,8 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals("")) {
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- } else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ } else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
@@ -405,7 +405,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperSshBgpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -199,7 +199,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -407,7 +407,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -9,6 +9,7 @@
package
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters;
import java.awt.Toolkit;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -88,11 +89,15 @@
// count[i] = 0;
} catch (PerfSONARException e) {
-
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.");
+ devices = new ArrayList();
+ count = new int[0];
+ arrayInitialized = true;
+
+ //throw new
PerfSONARException("error.mp.sshtelnet.configuration",
+ // "Failed to obtain reference to the properties and/or
logger instances.");
+
}
}// WebserviceEngineAdapter
@@ -552,7 +557,9 @@
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");
+ if (devices.size() == 0)
+ datum.setValue("eXist
database reachable and metadata configuration file found, however, no devices
are configured in the MP");
+ else datum.setValue("eXist database
reachable and metadata configuration file found");
resDataDataBlock[0].setDatum(datum);
resData.addChild(resDataMetadataBlock[0]);
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks/InternalChecker.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -1,5 +1,6 @@
package
org.perfsonar.service.measurementPoint.lookingGlassType.internalChecks;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -75,12 +76,6 @@
logger.debug("[InternalChecker][checkExist] eXist
database reachable.");
logger.debug("[InternalChecker][checkExist] Importing
names of the configured" +
" devices from eXist database...");
-
- devices =
properties.getProperties(MetadataConfiguration.DEVICE_NAMES);
-
- logger.debug("[InternalChecker][checkExist]
Succesfully imported list of configured" +
- " devices from eXist database.");
-
} catch (PerfSONARException e) {
logger.error("[InternalChecker][checkExist] Failed to
initialise the " +
"StorageManager. Problem with eXist
database!");
@@ -88,7 +83,20 @@
"database!";
clear = false;
}
+ try {
+ devices =
properties.getProperties(MetadataConfiguration.DEVICE_NAMES);
+ logger.debug("[InternalChecker][checkExist]
Succesfully imported list of configured" +
+ " devices from eXist database.");
+ } catch (PerfSONARException e) {
+ logger.error("[InternalChecker][checkExist] No
metadata in the metadata configuration");
+
+ devices = new ArrayList();
+
+ description = "Metadata configuration file exists and
is reachable, but there is no " +
+ "metadata in it, so the MP will not
do anything usefull.";
+ }
+
return clear;
}
@@ -108,11 +116,15 @@
clear = false;
}
- if (clear) {
+ if (clear && devices.size() != 0) {
logger.debug("[InternalChecker][checkDevices] Devices
can be reached and are " +
"working correctly.");
- } else logger.debug("[InternalChecker][checkDevices] At least
one device cannot be" +
- " reached.");
+ } else if (!clear && devices.size() != 0) {
+ logger.debug("[InternalChecker][checkDevices] At
least one device cannot be" +
+ " reached.");
+ } else if (devices.size() == 0) {
+ logger.debug("[InternalChecker][checkDevices] There
are no devices configured.");
+ }
return clear;
}
@@ -164,6 +176,8 @@
} catch (PerfSONARException e) {
logger.debug("[InternalChecker][checkDevice]
Something went wrong while getting the" +
" connection details for the device "
+ device);
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[InternalChecker][checkDevice]
" + e.getStackTrace()[i].toString());
return false;
}
@@ -204,6 +218,8 @@
} catch (PerfSONARException e) {
logger.debug("[InternalChecker][checkDevice]
Something went wrong while getting " +
"the details for the command " +
command_name + " for device " + device);
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[InternalChecker][checkDevice]
" + e.getStackTrace()[i].toString());
return false;
}
@@ -266,6 +282,8 @@
manager.disconnect();
} catch (Exception e) {
logger.error("[InternalChecker][takeTelnetAction]
Error while connecting to device " + device);
+ for (int i = 0; i < e.getStackTrace().length; i++)
+
logger.error("[InternalChecker][takeTelnetAction] " +
e.getStackTrace()[i].toString());
clear = false;
}
return clear;
@@ -275,7 +293,7 @@
boolean clear = true;
try {
- SshManager manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ SshManager manager = new SshManager(url, port,
username, PasswordEncryptor.decryptPassword(password), false, timeout);
logger.debug("[InternalChecker][takeSshAction]
Connecting to device and executing command: " + command);
manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
@@ -288,6 +306,8 @@
logger.debug("[InternalChecker][takeSshAction] Command succesfully executed");
} catch (PerfSONARException e) {
logger.error("[InternalChecker][takeSshAction] Error
while connecting to device " + device);
+ for (int i = 0; i < e.getStackTrace().length; i++)
+
logger.error("[InternalChecker][takeSshAction] " +
e.getStackTrace()[i].toString());
clear = false;
}
@@ -300,9 +320,9 @@
try {
SshKeyManager manager;
if (passphrase == null || passphrase.equals(""))
- manager = new SshKeyManager(url, username,
keyUrl, false, timeout);
+ manager = new SshKeyManager(url, port,
username, keyUrl, false, timeout);
else
- manager = new SshKeyManager(url, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port,
username, keyUrl, PasswordEncryptor.decryptPassword(passphrase), false,
timeout);
logger.debug("[InternalChecker][takeKeyAction]
Connecting to device and executing command: " + command);
manager.connect(username, "Username:",
PasswordEncryptor.decryptPassword(password), "Password:");
@@ -315,6 +335,8 @@
logger.debug("[InternalChecker][takeKeyAction] Command succesfully executed");
} catch (PerfSONARException e) {
logger.error("[InternalChecker][takeKeyAction] Error
while connecting to device " + device);
+ for (int i = 0; i < e.getStackTrace().length; i++)
+
logger.error("[InternalChecker][takeKeyAction] " +
e.getStackTrace()[i].toString());
clear = false;
}
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -240,8 +240,8 @@
timeout =
Integer.parseInt(properties.getProperty(subject, "timeout"));
if (passphrase == null ||
passphrase.equals("")) {
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- } else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ } else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
@@ -455,7 +455,7 @@
caching =
Integer.parseInt(properties.getProperty(subject, "cache"));
timeout =
Integer.parseInt(properties.getProperty(subject, "timeout"));
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoSshIpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -215,7 +215,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
} catch (Exception e) {
@@ -414,7 +414,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -216,8 +216,8 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals("")) {
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- } else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ } else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
@@ -439,7 +439,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperSshIpAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -214,7 +214,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -428,7 +428,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -208,8 +208,8 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals("")) {
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- } else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ } else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
@@ -406,7 +406,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoSshIpv6Adapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -203,7 +203,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -404,7 +404,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -207,8 +207,8 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals(""))
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
} catch (Exception e) {
@@ -415,7 +415,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperSshIpv6Adapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -204,7 +204,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -415,7 +415,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -212,22 +212,25 @@
String[] xmlResults = (String[]) object;
if (xmlResults == null) {
- throw new PerfSONARException(
+ logger.error("[DbMetadataConfiguration][getProperties] Result
array of metadata search is null");
+ throw new PerfSONARException(
"error.mp",
- "DbMetadataConfiguration.getProperties: " + "Result
array of metadata search in null");
+ "DbMetadataConfiguration.getProperties: " + "Result
array of metadata search is null");
}
//logger.debug("DbMetadataConfiguration.getProperties: " + "The
number of elements returned as a result of xquery statement: " +
xmlResults.length);
if (xmlResults.length == 0) {
- throw new PerfSONARException(
+ logger.error("[DbMetadataConfiguration][getProperties] No
metadata in the metadata configuration");
+ throw new PerfSONARException(
"warning.mp.metadata_configuration",
"DbMetadataConfiguration.getProperties: " + "No metadata
in the metadata configuration");
}
if (xmlResults.length == 1) {
if (xmlResults[0].trim().equals("")) {
- throw new PerfSONARException(
+ logger.error("[DbMetadataConfiguration][getProperties] No
metadata in the metadata configuration");
+ throw new PerfSONARException(
"warning.mp.metadata_configuration",
"DbMetadataConfiguration.getProperties: " + "No
metadata in the metadata configuration");
}
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -206,8 +206,8 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals(""))
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
} catch (Exception e) {
@@ -399,7 +399,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoSshStatusAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -210,7 +210,7 @@
//System.out.println(PasswordEncryptor.decryptPassword(password));
//System.out.println(url);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -405,7 +405,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -206,8 +206,8 @@
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
if (passphrase == null || passphrase.equals(""))
- manager = new SshKeyManager(url, username, keyUrl,
false, timeout);
- else manager = new SshKeyManager(url, username, keyUrl,
PasswordEncryptor.decryptPassword(passphrase), false, timeout);
+ manager = new SshKeyManager(url, port, username,
keyUrl, false, timeout);
+ else manager = new SshKeyManager(url, port, username,
keyUrl, PasswordEncryptor.decryptPassword(passphrase), false, timeout);
}
} catch (Exception e) {
@@ -413,7 +413,7 @@
caching = Integer.parseInt(properties.getProperty(subject,
"cache"));
timeout = Integer.parseInt(properties.getProperty(subject,
"timeout"));
- manager = new SshKeyManager(url, username, keyUrl, false,
timeout);
+ manager = new SshKeyManager(url, port, username, keyUrl, false,
timeout);
} catch (NumberFormatException e1) {
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperSshStatusAdapter.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -200,7 +200,7 @@
//System.out.println(username);
//System.out.println(password);
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
}
@@ -408,7 +408,7 @@
username = properties.getProperty(subject, "username");
password = properties.getProperty(subject, "password");
- manager = new SshManager(url, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
+ manager = new SshManager(url, port, username,
PasswordEncryptor.decryptPassword(password), false, timeout);
} catch (NumberFormatException e1) {
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/MyUserInfo.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/MyUserInfo.java
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/MyUserInfo.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -1,41 +1,55 @@
package org.perfsonar.service.measurementPoint.remote.ssh;
+import com.jcraft.jsch.UIKeyboardInteractive;
import com.jcraft.jsch.UserInfo;
-public class MyUserInfo implements UserInfo {
+public class MyUserInfo implements UserInfo, UIKeyboardInteractive {
- String passwd;
+ String passwd;
- public MyUserInfo(String passwd) {
+ public MyUserInfo(String passwd) {
- super();
- this.passwd = passwd;
+ super();
+ this.passwd = passwd;
- }
+ }
- public String getPassword() {
- //System.out.println("It worked ... were the best RMan");
- //System.out.println(passwd);
- return passwd;
- }
+ public String getPassword() {
+ //System.out.println(passwd);
+ return passwd;
+ }
- public boolean promptYesNo(String str) {
- return true;
- }
+ public boolean promptYesNo(String str) {
+ return true;
+ }
- public String getPassphrase() {
- return null;
- }
+ public String getPassphrase() {
+ return null;
+ }
- public boolean promptPassphrase(String message) {
- return true;
- }
+ public boolean promptPassphrase(String message) {
+ return true;
+ }
- public boolean promptPassword(String message) {
- return true;
- }
+ public boolean promptPassword(String message) {
+ return true;
+ }
- public void showMessage(String message) {
- //System.err.println(message);
- }
+ public void showMessage(String message) {
+ //System.err.println(message);
+ }
+
+ public String[] promptKeyboardInteractive(
+ String destination,
+ String name,
+ String instruction,
+ String[] prompt,
+ boolean[] echo){
+ if(prompt.length!=1 || echo[0]!=false || this.passwd==null){
+ return null;
+ }
+ String[] response=new String[1];
+ response[0]=this.passwd;
+ return response;
+ }
}
Modified:
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
===================================================================
---
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -40,6 +40,7 @@
private Session session = null;
private UserInfo ui = null;
private String url = null;
+ private int port = 0;
private String userName = null;
private String keyUrl = null;
private String passphrase = null;
@@ -47,11 +48,12 @@
private boolean connected = false;
private int timeout = 0;
- public SshKeyManager(String url, String userName, String keyUrl,
+ public SshKeyManager(String url, int port, String userName, String
keyUrl,
boolean connect, int timeout) {
super();
this.url = url;
+ this.port = port;
this.userName = userName;
this.keyUrl = keyUrl;
ui = new MyUserInfo(keyUrl);
@@ -63,7 +65,7 @@
} catch (PerfSONARException e1) {
- logger.error("[SSHKEYMANAGER][Constructor]" +
e1.getStackTrace().toString());
+ logger.error("[SshKeyManager][Constructor]" +
e1.getStackTrace()[0].toString());
}
@@ -83,11 +85,12 @@
} // SshKeyManager
- public SshKeyManager(String url, String userName, String keyUrl,
+ public SshKeyManager(String url, int port, String userName, String
keyUrl,
String passphrase, boolean connect, int timeout) {
super();
this.url = url;
+ this.port = port;
this.userName = userName;
this.keyUrl = keyUrl;
this.passphrase = passphrase;
@@ -99,9 +102,10 @@
logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
} catch (PerfSONARException e1) {
+ logger.error("[SshKeyManager][Constructor]" +
e1.getMessage());
+ for (int i = 0; i < e1.getStackTrace().length; i++)
+ logger.error("[SshKeyManager][Constructor]" +
e1.getStackTrace()[i].toString());
- logger.error("[SSHKEYMANAGER][Constructor]" +
e1.getStackTrace().toString());
-
}
if (connect) {
@@ -122,10 +126,15 @@
public void connect() throws PerfSONARException {
- logger.debug("[SshKeyManager] connecting initiatec ...");
+ logger.debug("[SshKeyManager] connecting initiated ...");
try {
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
//Create a new Client for communication
jsch = new JSch();
@@ -135,11 +144,16 @@
else jsch.addIdentity(keyUrl, passphrase);
//Create session
- session = jsch.getSession(userName, url, 22);
+ session = jsch.getSession(userName, url, port);
- //Set user info
+ // Disable StrictHostKeyChecking
+ logger.debug("[SshKeyManager][Connect] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
+ // Set user info
+ logger.debug("[SshKeyManager][Connect] UserInfo: " + ui);
session.setUserInfo(ui);
-
+
//Connect
session.connect();
@@ -148,8 +162,9 @@
logger.debug("[SshKeyManager] Connection established");
} catch (JSchException e) {
-
- logger.error("[SSHKEYMANAGER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[SshKeyManager][Connect]" + e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshKeyManager][Connect]" +
e.getStackTrace()[i].toString());
throw new PerfSONARException(
"[SshKeyManager] An error occured");
@@ -171,6 +186,11 @@
try {
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
//Create a new Client for communication
jsch = new JSch();
@@ -178,9 +198,14 @@
jsch.addIdentity(keyUrl);
//Create session
- session = jsch.getSession(userName, url, 22);
+ session = jsch.getSession(userName, url, port);
- //Set user info
+ // Disable StrictHostKeyChecking
+ logger.debug("[SshKeyManager][Connect] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
+ // Set user info
+ logger.debug("[SshKeyManager][Connect] UserInfo: " + ui);
session.setUserInfo(ui);
//Connect
@@ -191,8 +216,9 @@
logger.debug("[SshKeyManager] Connection established");
} catch (JSchException e) {
-
- logger.error("[SSHKEYMANAGER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[SshKeyManager][Connect]" + e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SSHKEYMANAGER][Connect]" +
e.getStackTrace()[i].toString());
throw new PerfSONARException(
"[SshKeyManager] An error occured");
@@ -206,6 +232,11 @@
try {
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
//Create a new Client for communication
jsch = new JSch();
@@ -213,9 +244,14 @@
jsch.addIdentity(keyUrl, passphrase);
//Create session
- session = jsch.getSession(userName, url, 22);
+ session = jsch.getSession(userName, url, port);
- //Set user info
+ // Disable StrictHostKeyChecking
+ logger.debug("[SshKeyManager][Connect] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
+ // Set user info
+ logger.debug("[SshKeyManager][Connect] UserInfo: " + ui);
session.setUserInfo(ui);
//Connect
@@ -226,8 +262,9 @@
logger.debug("[SshKeyManager] Connection established");
} catch (JSchException e) {
-
- logger.error("[SSHKEYMANAGER][Connect]" +
e.getStackTrace().toString());
+ logger.error("[SshKeyManager][Connect]" + e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshKeyManager][Connect]" +
e.getStackTrace()[i].toString());
throw new PerfSONARException(
"[SshKeyManager] An error occured");
@@ -242,8 +279,9 @@
return session.openChannel("exec");
} catch (JSchException e) {
-
- logger.error("[SSHKEYMANAGER][GetSshChannel]" +
e.getStackTrace().toString());
+ logger.error("[SshKeyManager][GetSshChannel]" +
e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshKeyManager][GetSshChannel]" +
e.getStackTrace()[i].toString());
return null;
}
@@ -262,13 +300,28 @@
try {
if (jsch == null) {
ui = new MyUserInfo(this.keyUrl);
+
+ java.util.Properties config=new
java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
jsch = new JSch();
jsch.addIdentity(keyUrl);
- session = jsch.getSession(this.userName, this.url,
22);
- session.setUserInfo(ui);
+ session = jsch.getSession(this.userName, this.url,
port);
+
+ // Set user info
+ logger.debug("[SshKeyManager][ExecuteCommand] UserInfo: " +
ui);
+ session.setUserInfo(ui);
}
if (!session.isConnected()) {
+ // Disable StrictHostKeyChecking
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+ logger.debug("[SshKeyManager][ExecuteCommand] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
session.connect();
}
@@ -328,10 +381,14 @@
logger.debug("result: " + result);
return result;
} catch (JSchException e) {
- e.printStackTrace();
+ logger.error("[SshKeyManager][ExecuteCommand]" +
e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][ExecuteCommand]" +
e.getStackTrace()[i].toString());
return "An Error Occured";
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("[SshKeyManager][ExecuteCommand]" +
e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][ExecuteCommand]" +
e.getStackTrace()[i].toString());
return "An Error Occured";
}
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -47,21 +47,23 @@
private String url = null;
private String userName = null;
private String password = null;
+ private int port = 0;
private LoggerComponent logger = null;
private boolean connected = false;
private int timeout = 0;
// ---------------------- constructors
- public SshManager(String url, String userName, String password,
+ public SshManager(String url, int port, String userName, String password,
boolean connect, int timeout) {
super();
this.url = url;
+ this.port = port;
this.userName = userName;
this.password = password;
this.timeout = timeout;
- //ui = new MyUserInfo(password);
+ ui = new MyUserInfo(password);
try {
@@ -102,13 +104,24 @@
logger.debug("[SshManager] connecting initiated ...");
//System.out.println("[SshManager] connecting initiated ...");
- // Create a new Client for communication
+ // Disable StrictHostKeyChecking
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
+ // Create a new Client for communication
jsch = new JSch();
-
+
// Create session
- session = jsch.getSession(userName, url, 22);
-
+ session = jsch.getSession(userName, url, port);
+
+ // Disable StrictHostKeyChecking
+ logger.debug("[SshManager][Connect] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
//Set user info
+ logger.debug("[SshManager][Connect] UserInfo: " + ui);
session.setUserInfo(ui);
//Connect
@@ -117,9 +130,10 @@
connected = true;
} catch (JSchException e) {
+ logger.error("[SshManager][Connect]" + e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][Connect]" +
e.getStackTrace()[i].toString());
- logger.error("[SshManager][Connect]" +
e.getStackTrace()[0].toString());
-
}
}// connect
@@ -135,14 +149,25 @@
logger.debug("[SshManager] connecting initiated ...");
//System.out.println("[SshManager] connecting initiated ...");
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
// Create a new Client for communication
jsch = new JSch();
// Create session
- session = jsch.getSession(userName, url, 22);
+ session = jsch.getSession(userName, url, port);
+ // Disable StrictHostKeyChecking
+
+ logger.debug("[SshManager][Connect] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
//Set user info
- session.setUserInfo(ui);
+ logger.debug("[SshManager][Connect] UserInfo: " + ui);
+ session.setUserInfo(ui);
//Connect
session.connect();
@@ -150,9 +175,10 @@
connected = true;
} catch (JSchException e) {
-
- logger.error("[SshManager][Connect]" +
e.getStackTrace()[0].toString());
-
+ logger.error("[SshManager][Connect]" + e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][Connect]" +
e.getStackTrace()[i].toString());
+
}
}// connect
public void connect(String username, String keyUrl, String passphrase)
throws PerfSONARException {
@@ -173,8 +199,9 @@
return session.openChannel("exec");
} catch (JSchException e) {
-
- logger.error("[SshManager][GetSshChannel]" +
e.getStackTrace()[0].toString());
+ logger.error("[SshManager][Connect]" + e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][GetSshChannel]" +
e.getStackTrace()[i].toString());
return null;
}
@@ -193,13 +220,26 @@
try {
if (jsch == null) {
- ui = new MyUserInfo(this.password);
+ java.util.Properties config=new
java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ JSch.setConfig(config);
+
jsch = new JSch();
- session = jsch.getSession(this.userName, this.url,
22);
+
+ session = jsch.getSession(this.userName, this.url,
port);
+ logger.debug("[SshManager][ExecuteCommand] UserInfo:
" + ui);
session.setUserInfo(ui);
}
if (!session.isConnected()) {
+
+ // Disable StrictHostKeyChecking
+ java.util.Properties config=new java.util.Properties();
+ config.put("StrictHostKeyChecking", "no");
+ logger.debug("[SshManager][Connect] Disabling
StrictHostKeyChecking");
+ session.setConfig(config);
+
session.connect();
}
@@ -225,7 +265,8 @@
channel2.disconnect();
session.disconnect();
} catch (InterruptedException ex) {
- logger.error("[SshManager][ExecuteCommand]" +
ex.getStackTrace()[0].toString());
+ for (int i = 0; i <
ex.getStackTrace().length; i++)
+
logger.error("[SshManager][ExecuteCommand]" +
ex.getStackTrace()[i].toString());
}
}
};
@@ -233,7 +274,7 @@
}
byte[] tmp = new byte[1024];
while (true) {
- while (in.available() > 0) {
+ while (in != null && in.available() > 0) {
int i = in.read(tmp, 0, 1024);
if (i < 0) {
break;
@@ -258,13 +299,19 @@
//logger.debug("result: " + result);
return result;
} catch (JSchException e) {
- e.printStackTrace();
+ logger.error("[SshManager][ExecuteCommand] JSchException: " +
e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][ExecuteCommand]" +
e.getStackTrace()[i].toString());
return "An Error Occured";
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("[SshManager][ExecuteCommand] IOException: " +
e.getMessage());
+ for (int i = 0; i < e.getStackTrace().length; i++)
+ logger.error("[SshManager][ExecuteCommand]" +
e.getStackTrace()[i].toString());
return "An Error Occured";
} catch (Exception t){
- t.printStackTrace();
+ logger.error("[SshManager][ExecuteCommand] Exception: " +
t.getMessage());
+ for (int i = 0; i < t.getStackTrace().length; i++)
+ logger.error("[SshManager][ExecuteCommand]" +
t.getStackTrace()[i].toString());
return "An Error Occured";
}
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
2009-03-27 15:43:33 UTC (rev 5096)
+++
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2009-03-27 15:45:14 UTC (rev 5097)
@@ -18,10 +18,7 @@
import perfSONARWebAdmin.auxiliary.PerfsonarProperties;
import perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl;
import perfSONARWebAdmin.auxiliary.PerfsonarProperty;
-import perfSONARWebAdmin.auxiliary.ServiceProperties;
-import perfSONARWebAdmin.auxiliary.ServicePropertiesImpl;
import perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler;
-import perfSONARWebAdmin.auxiliary.wizard.HTMLOutput;
import perfSONARWebAdmin.auxiliary.wizard.WizardProperties;
import perfSONARWebAdmin.auxiliary.wizard.WizardProperty;
import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBManager;
@@ -64,8 +61,118 @@
htmlOutput = output;
}*/
+
+ /**
+ * Method used for handling LS registration configuration
+ *
+ * @param request
+ * The HttpServletRequest containing input from the user
+ * @return True if LS registration is configured successfully
+ * @throws Exception
+ */
+ protected void handleSpecific(HttpServletRequest request) throws
MaskedException {
+ // Retrieving the useLS parameter. The useLS parammeter is
inserted as
+ // input by the shoaAllProperties method of the HTMLOutput
class
+ // automatically. It is the answer to if the user wants to
register to
+ // an LS since their is no service property that corresponds
to this
+ // question
+ String useLS = request.getParameter("useLS").trim();
+ // If yes all other properties regarding LS registration are
retrieved
+ if (useLS.equals("yes")) {
+ // Retrieving all propertie associated with LS
+ WizardProperties lsProperties =
groupedProperties.get("LS");
+ // Getting the keys of the properties
+ Iterator it = lsProperties.orderedKeys();
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ // Using the keys for retrieving the users
input
+ String value =
request.getParameter(key).trim();
+ WizardProperty pr =
lsProperties.getWizardProperty(key);
+ // Setting property value and proposed value
+ pr.setPropertyValue(value);
+ pr.setProposedValue(value);
+ // Setting property
+ lsProperties.setWizardProperty(key, pr);
+ }
+ // Setting the LS group properties
+ groupedProperties.put("LS", lsProperties);
+ boolean done = false;
+ // Trying to perfom the LS configuration actions to
the service
+ try {
+ lsActions(lsProperties);
+ done = true;
+ } catch (Exception e) {
+ // False if an error happens
+ done = false;
+ throw (MaskedException)e;
+ }
+ }
+ // If no then the registration componenets are commented in
the
+ // components.properties file
+ else {
+ try {
+ removeRegistrationComponents();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ System.out.println("Cannot ");
+ }
+ }
+ }
+
/**
+ * Method for handling all configuration actions regarding the LS
+ * registration
+ *
+ * @param finalProperties
+ * The WizardProperties that belong to the LS registration
group
+ * @throws IOException
+ */
+ private void lsActions(WizardProperties finalProperties) throws
IOException {
+ // 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));
+ Iterator it = finalProperties.orderedKeys();
+ // Iterating through the LS registration properties properties
+
+ // Initializing the PerfsonarProperty object that holds
information
+ // about grouping and description
+ PerfsonarProperty property = new PerfsonarProperty();
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ // Set the service properties
+
+ // Get the PerfsonarProperty object
+ property = serviceProperties.getProperty(key);
+
+ // If property key does not exist throw an exceptrion
+ if (property == null) {
+ throw new IOException("Key is invalid " + key
+ " ");
+ } else {
+ // Else set the value right
+
property.setValue(finalProperties.getProperty(key));
+ serviceProperties.setProperty(key, property);
+ }
+ // Set the wizard properties
+ properties.setWizardProperty(key, finalProperties
+ .getWizardProperty(key));
+ }
+ // Storing service properties
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));
+ // Setting the LS registration componenets in components
properties file
+ addRegistrationComponents();
+ // Storing the wizard properties
+ properties.storeToXML(new FileOutputStream(new
File(ServicePath
+ + WizardPropertiesPath)), " Last Modification
"
+ +
Calendar.getInstance().getTime().toString());
+ }
+
+ /**
* Method used for handling eXist database configuration
*
* @param request
@@ -311,5 +418,69 @@
return true;
}
+
+ /**
+ * Method used for adding registration componenets to the
+ * componenets.properties file
+ *
+ * @throws IOException
+ */
+ private void addRegistrationComponents() throws IOException {
+ File comp = new File(ServicePath + ComponentsPropertiesPath);
+ FileReader fr = new FileReader(comp);
+ StringBuffer contents = new StringBuffer();
+ BufferedReader br = new BufferedReader(fr);
+ String line = "";
+ while (line != null) {
+ if (line.startsWith("#scheduler")) {
+ line = line.substring(1);
+ }
+ if (line.startsWith("#registrator")) {
+ line = line.substring(1);
+ }
+ contents.append(line + "\n");
+ line = br.readLine();
+ }
+
+ FileWriter fw = new FileWriter(comp);
+ BufferedWriter bw = new BufferedWriter(fw);
+ bw.write(contents.toString().trim());
+ bw.close();
+ fw.close();
+ br.close();
+ fr.close();
+ }
+
+ /**
+ * Method for removing ls registration components from
components.properties
+ * file
+ *
+ * @throws IOException
+ */
+ private void removeRegistrationComponents() throws IOException {
+ File comp = new File(ServicePath + ComponentsPropertiesPath);
+ FileReader fr = new FileReader(comp);
+ StringBuffer contents = new StringBuffer();
+ BufferedReader br = new BufferedReader(fr);
+ String line = "";
+ while (line != null) {
+ if (line.startsWith("scheduler")) {
+ line = "#" + line;
+ }
+ if (line.startsWith("registrator")) {
+ line = "#" + line;
+ }
+ contents.append(line + "\n");
+ line = br.readLine();
+ }
+
+ FileWriter fw = new FileWriter(comp);
+ BufferedWriter bw = new BufferedWriter(fw);
+ bw.write(contents.toString().trim());
+ bw.close();
+ fw.close();
+ br.close();
+ fr.close();
+ }
}
- perfsonar: r5097 - in branches/geant2_java-sshtelnet-mp-RELEASE: ant conf conf/axis-1.4/WEB-INF/classes/perfsonar/conf packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/internalChecks src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/webAdmin, svnlog, 03/27/2009
Archive powered by MHonArc 2.6.16.