Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3562 - in trunk/geant2_java-sshtelnet-mp: ant conf doc src/main/java/org/perfsonar/service/measurementPoint/webAdmin

Subject: perfsonar development work

List archive

perfsonar: r3562 - in trunk/geant2_java-sshtelnet-mp: ant conf doc src/main/java/org/perfsonar/service/measurementPoint/webAdmin


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3562 - in trunk/geant2_java-sshtelnet-mp: ant conf doc src/main/java/org/perfsonar/service/measurementPoint/webAdmin
  • Date: Thu, 27 Mar 2008 06:59:43 -0400
Author: melis
Date: 2008-03-27 06:59:43 -0400 (Thu, 27 Mar 2008)
New Revision: 3562

Modified:
trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/const.properties
trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt
trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
trunk/geant2_java-sshtelnet-mp/doc/changelog.txt

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
Log:
Updated the trunk to RC4

Modified: trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-03-27
08:48:57 UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-03-27
10:59:43 UTC (rev 3562)
@@ -50,11 +50,11 @@
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.20080303/perfsonar-base-1.0.20080303.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}/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"/>
- <copy file="${basedir}/conf/metadata.xml"

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

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

<copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
<copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${service.home}/${deploy.root}/wsdd"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-03-27 08:48:57
UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-03-27 10:59:43
UTC (rev 3562)
@@ -11,7 +11,7 @@
service.name=geant2_java-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3RC3
+version=1.3RC4

exist.war.file=exist-1.0.1.war

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

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-03-27 08:48:57 UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-03-27 10:59:43 UTC (rev 3562)
@@ -11,7 +11,7 @@
service.name=geant2_java-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3RC3
+version=1.3RC4

exist.war.file=exist-1.0.1.war

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

Modified: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-03-27 08:48:57 UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-03-27 10:59:43 UTC (rev 3562)
@@ -60,7 +60,7 @@
<artifact:dependencies>

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



Modified: trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt 2008-03-27
08:48:57 UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscoipv6commands.txt 2008-03-27
10:59:43 UTC (rev 3562)
@@ -5,7 +5,7 @@
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@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})?
advertised-routes$
-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})? received
routes$
+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})?
received-routes$
IPv6_BGP_DAMPENING_FLAP_STATISTICS@@@show bgp IPv6 unicast dampening
flap-statistics@@@0@@@0@@@cache@@@display information about all flapping BGP
routes@@@---@@@---
IPv6_INTERFACE@@@show IPv6 interface@@@1@@@1@@@cache@@@display information
about interfaces running IPv6@@@<interface>@@@.*
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: trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2008-03-27
08:48:57 UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/conf/ciscominimumpackage.txt 2008-03-27
10:59:43 UTC (rev 3562)
@@ -17,7 +17,7 @@
IPv6_BGP_TABLE@@@show bgp IPv6 unicast@@@1@@@1@@@cache@@@display current BGP
table routing entry for <IPv6 prefix>@@@<IPv6 prefix network> [<length>]@@@.*
IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast@@@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})?
advertised-routes$
-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})? received
routes$
+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})?
received-routes$
IPv6_PING@@@ping IPv6@@@1@@@1@@@cache@@@Ping an <IPv6 address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6
address>@@@<IPv6
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
IPv6_ROUTE@@@show IPv6 route@@@1@@@1@@@cache@@@display IPv6 routing table
entry for <IPv6 address>@@@[<IPv6
address>]@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$

Modified: trunk/geant2_java-sshtelnet-mp/doc/changelog.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/doc/changelog.txt 2008-03-27 08:48:57
UTC (rev 3561)
+++ trunk/geant2_java-sshtelnet-mp/doc/changelog.txt 2008-03-27 10:59:43
UTC (rev 3562)
@@ -18,4 +18,10 @@

1.3RC3 - 06/03/2008

- * fixed timeout bug in the telnet side of the SSHTELNET MP
\ No newline at end of file
+ * fixed timeout bug in the telnet side of the SSHTELNET MP
+
+1.3RC4 - 27/03/2008
+
+ * ps-base version: 1.0.20080310
+ * web-admin version: 0.8b
+ * no further fixes
\ No newline at end of file

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-03-27 08:48:57 UTC (rev 3561)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-03-27 10:59:43 UTC (rev 3562)
@@ -493,14 +493,21 @@
while (it.hasNext()) {
String key = (String) it.next();
if (key.endsWith("xmldb.db_adminpassword")) {
- adminPass =
serviceProperties.getProperty(key).trim();
+
+
/********************************************************************
+ * CODE CHANGE HERE
*
+ * //This is no discarderd, no use
for it now. *
+ * // adminPass =
serviceProperties.getProperty(key).getValue() *
+ * // .trim();`
*
+
********************************************************************/
+
newAdminPass =
finalProperties.getProperty(key).trim();
}
if (key.endsWith("xmldb.db_uri")) {
existURI =
finalProperties.getProperty(key);
}

- }
+ }

//System.out.println("adminPass: " + adminPass +
"\nnewAdminPass: " + newAdminPass);

@@ -520,6 +527,12 @@
// slight modification for the xmldb uri. We
need to add the
// collection at the end of the URI
//if (!key.endsWith("xmldb.db_uri")) {
+
+ // Now we need to get the old password from
the user
+ if (key.equals("old_adminpassword")) {

+ adminPass =
finalProperties.getProperty(key).trim();
+ }
+
serviceProperties.setProperty(key,
finalProperties.getProperty(key));
servletProperties.setProperty(key,
finalProperties.getProperty(key));
//} else {


  • perfsonar: r3562 - in trunk/geant2_java-sshtelnet-mp: ant conf doc src/main/java/org/perfsonar/service/measurementPoint/webAdmin, svnlog, 03/27/2008

Archive powered by MHonArc 2.6.16.

Top of Page