perfsonar development work

Author: melis
Date: 2009-01-13 09:32:12 -0500 (Tue, 13 Jan 2009)
New Revision: 4870

Added:
   branches/geant2_java-sshtelnet-mp-STABLE/doc/License.txt
   
branches/geant2_java-sshtelnet-mp-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
Modified:
   branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties
   branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties.template
   
branches/geant2_java-sshtelnet-mp-STABLE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
   branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipcommands.txt
   branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipv6commands.txt
   branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscominimumpackage.txt
   branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties
   branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties.template
   
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
   
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
   
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
   
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
   
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
   
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/changelog
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/copyright
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/docs
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/files
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/install
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/postinst
   branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/rules
   
branches/geant2_java-sshtelnet-mp-STABLE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
Log:
updated everything in the STABLE branch to version 1.3.4

Modified: branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties       
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties       
2009-01-13 14:32:12 UTC (rev 4870)
@@ -11,7 +11,7 @@
 service.name=ps-mdm-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4RC8
+version=1.3.4
 
 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-STABLE/ant/const.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties.template    
  2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/ant/const.properties.template    
  2009-01-13 14:32:12 UTC (rev 4870)
@@ -11,7 +11,7 @@
 service.name=ps-mdm-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4RC8
+version=1.3.4
 
 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-STABLE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
    2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
    2009-01-13 14:32:12 UTC (rev 4870)
@@ -84,7 +84,7 @@
 
 # Group=LS
 # Description=The version number of the service.
-service.r.service_version=1.3.4RC8
+service.r.service_version=1.3.4
 
 # Group=LS
 # Description=The email address of the person who manages the service.

Modified: branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipcommands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipcommands.txt   
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipcommands.txt   
2009-01-13 14:32:12 UTC (rev 4870)
@@ -8,7 +8,7 @@
 IP_OSPF_NEIGHBOR@@@show ip ospf neighbor@@@0@@@0@@@cache@@@display the OSPF 
neighbour list@@@---@@@---
 IP_OSPF_DB_EXT@@@show ip ospf database external@@@1@@@1@@@cache@@@display 
the OSPF database externa link states@@@---@@@---
 IP_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing table 
for <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display 
IP multicast table@@@<prefix> [<length>]@@@.*
+IP_MULTICAST_BGP_TABLE@@@show ip bgp ipv4 
multicast@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> 
[<length>]@@@.*
 IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast 
forwarding state@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SA-CACHE@@@show ip msdp sa-cache@@@1@@@1@@@cache@@@display 
(S,G) state learned from MSDP peers@@@<peer IP 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer 
status@@@---@@@---

Modified: branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipv6commands.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipv6commands.txt 
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscoipv6commands.txt 
2009-01-13 14:32:12 UTC (rev 4870)
@@ -2,18 +2,19 @@
 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 summary@@@0@@@0@@@cache@@@display the 
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast 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})?$
 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})?$
-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_TRACEROUTE@@@trace IPv6@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6 
address>@@@<IPv6 
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_OSPF_DB@@@show IPv6 ospf database@@@0@@@0@@@cache@@@display the OSPF3 
neighbour list@@@---@@@---
 IPv6_OSPF_NEIGHBOR@@@show IPv6 ospf neighbor@@@0@@@0@@@cache@@@display the 
OSPF3 database@@@---@@@---
 IPv6_OSPF_DB_EXT@@@show IPv6 ospf database 
external@@@0@@@0@@@cache@@@display the OSPF3 database external link 
status@@@---@@@---
 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})$
 IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display 
IPv6 multicast table@@@<IPv6 
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast 
IPv6 forwarding state@@@---@@@---
-IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information 
for <IPv6 
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file
+IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information 
for <IPv6 
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
+IPv6_MULTICAST_BGP_SUMMARY@@@show bgp IPv6 multicast 
summary@@@0@@@0@@@cache@@@display the status of all current IPv6 multicast 
BGP connections@@@---@@@---
\ No newline at end of file

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscominimumpackage.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscominimumpackage.txt     
  2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/conf/ciscominimumpackage.txt     
  2009-01-13 14:32:12 UTC (rev 4870)
@@ -9,17 +9,17 @@
 IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IP path to <ip 
address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing table 
for <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display 
IP multicast table@@@<prefix> [<length>]@@@.*
+IP_MULTICAST_BGP_TABLE@@@show ip bgp ipv4 
multicast@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> 
[<length>]@@@.*
 IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast 
forwarding state@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer 
status@@@---@@@---
 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 summary@@@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})?$
-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_TRACEROUTE@@@trace IPv6@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6 
address>@@@<IPv6 
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 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})$
 IPv6_MULTICAST_BGP_TABLE@@@show BGP IPv6 multicast@@@1@@@1@@@cache@@@display 
IPv6 multicast table@@@<IPv6 
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast 
IPv6 forwarding state@@@---@@@---

Modified: branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties    
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties    
2009-01-13 14:32:12 UTC (rev 4870)
@@ -84,7 +84,7 @@
 
 # Group=LS
 # Description=The version number of the service.
-service.r.service_version=1.3.4RC8
+service.r.service_version=1.3.4
 
 # Group=LS
 # Description=The email address of the person who manages the service.

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties.template 
  2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/conf/service.properties.template 
  2009-01-13 14:32:12 UTC (rev 4870)
@@ -84,7 +84,7 @@
 
 # Group=LS
 # Description=The version number of the service.
-service.r.service_version=1.3.4RC8
+service.r.service_version=1.3.4
 
 # Group=LS
 # Description=The email address of the person who manages the service.

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
 2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipcommands.txt
 2009-01-13 14:32:12 UTC (rev 4870)
@@ -8,7 +8,7 @@
 IP_OSPF_NEIGHBOR@@@show ip ospf neighbor@@@0@@@0@@@cache@@@display the OSPF 
neighbour list@@@---@@@---
 IP_OSPF_DB_EXT@@@show ip ospf database external@@@1@@@1@@@cache@@@display 
the OSPF database externa link states@@@---@@@---
 IP_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing table 
for <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display 
IP multicast table@@@<prefix> [<length>]@@@.*
+IP_MULTICAST_BGP_TABLE@@@show ip bgp ipv4 
multicast@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> 
[<length>]@@@.*
 IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast 
forwarding state@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SA-CACHE@@@show ip msdp sa-cache@@@1@@@1@@@cache@@@display 
(S,G) state learned from MSDP peers@@@<peer IP 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer 
status@@@---@@@---

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
       2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscoipv6commands.txt
       2009-01-13 14:32:12 UTC (rev 4870)
@@ -2,18 +2,19 @@
 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 summray@@@0@@@0@@@cache@@@display the 
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast 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})?$
 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})?$
-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_TRACEROUTE@@@trace IPv6@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6 
address>@@@<IPv6 
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_OSPF_DB@@@show IPv6 ospf database@@@0@@@0@@@cache@@@display the OSPF3 
neighbour list@@@---@@@---
 IPv6_OSPF_NEIGHBOR@@@show IPv6 ospf neighbor@@@0@@@0@@@cache@@@display the 
OSPF3 database@@@---@@@---
 IPv6_OSPF_DB_EXT@@@show IPv6 ospf database 
external@@@0@@@0@@@cache@@@display the OSPF3 database external link 
status@@@---@@@---
 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})$
 IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display 
IPv6 multicast table@@@<IPv6 
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast 
IPv6 forwarding state@@@---@@@---
-IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information 
for <IPv6 
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file
+IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information 
for <IPv6 
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
+IPv6_MULTICAST_BGP_SUMMARY@@@show bgp IPv6 multicast 
summary@@@0@@@0@@@cache@@@display the status of all current IPv6 multicast 
BGP connections@@@---@@@---
\ No newline at end of file

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
     2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/CSV_Generator_script/conf/ciscominimumpackage.txt
     2009-01-13 14:32:12 UTC (rev 4870)
@@ -9,17 +9,17 @@
 IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IP path to <ip 
address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing table 
for <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display 
IP multicast table@@@<prefix> [<length>]@@@.*
+IP_MULTICAST_BGP_TABLE@@@show ip bgp ipv4 
multicast@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> 
[<length>]@@@.*
 IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast 
forwarding state@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer 
status@@@---@@@---
 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 summary@@@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})?$
-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_TRACEROUTE@@@trace IPv6@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6 
address>@@@<IPv6 
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 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})$
 IPv6_MULTICAST_BGP_TABLE@@@show BGP IPv6 multicast@@@1@@@1@@@cache@@@display 
IPv6 multicast table@@@<IPv6 
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast 
IPv6 forwarding state@@@---@@@---

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
   2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipcommands.txt
   2009-01-13 14:32:12 UTC (rev 4870)
@@ -8,7 +8,7 @@
 IP_OSPF_NEIGHBOR@@@show ip ospf neighbor@@@0@@@0@@@cache@@@display the OSPF 
neighbour list@@@---@@@---
 IP_OSPF_DB_EXT@@@show ip ospf database external@@@1@@@1@@@cache@@@display 
the OSPF database externa link states@@@---@@@---
 IP_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing table 
for <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display 
IP multicast table@@@<prefix> [<length>]@@@.*
+IP_MULTICAST_BGP_TABLE@@@show ip bgp ipv4 
multicast@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> 
[<length>]@@@.*
 IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast 
forwarding state@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SA-CACHE@@@show ip msdp sa-cache@@@1@@@1@@@cache@@@display 
(S,G) state learned from MSDP peers@@@<peer IP 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer 
status@@@---@@@---

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
 2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscoipv6commands.txt
 2009-01-13 14:32:12 UTC (rev 4870)
@@ -2,18 +2,19 @@
 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 summary@@@0@@@0@@@cache@@@display the 
status of all current IPv6 BGP connections@@@---@@@---
+IPv6_BGP_SUMMARY@@@show bgp ipv6 unicast 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})?$
 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})?$
-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_TRACEROUTE@@@trace IPv6@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6 
address>@@@<IPv6 
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_OSPF_DB@@@show IPv6 ospf database@@@0@@@0@@@cache@@@display the OSPF3 
neighbour list@@@---@@@---
 IPv6_OSPF_NEIGHBOR@@@show IPv6 ospf neighbor@@@0@@@0@@@cache@@@display the 
OSPF3 database@@@---@@@---
 IPv6_OSPF_DB_EXT@@@show IPv6 ospf database 
external@@@0@@@0@@@cache@@@display the OSPF3 database external link 
status@@@---@@@---
 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})$
 IPv6_MULTICAST_BGP_TABLE@@@show bgp IPv6 multicast@@@1@@@1@@@cache@@@display 
IPv6 multicast table@@@<IPv6 
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast 
IPv6 forwarding state@@@---@@@---
-IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information 
for <IPv6 
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
\ No newline at end of file
+IPv6_MULTICAST_RPF@@@show IPv6 rpf@@@1@@@1@@@cache@@@display RPF information 
for <IPv6 
address>@@@<IPv6-prefix>@@@^(([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})$
+IPv6_MULTICAST_BGP_SUMMARY@@@show bgp IPv6 multicast 
summary@@@0@@@0@@@cache@@@display the status of all current IPv6 multicast 
BGP connections@@@---@@@---
\ No newline at end of file

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
       2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/contrib/metadata_configuration_tools/Configuration_Tool/conf/ciscominimumpackage.txt
       2009-01-13 14:32:12 UTC (rev 4870)
@@ -9,17 +9,17 @@
 IP_PING@@@ping@@@1@@@1@@@cache@@@ping an <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_TRACEROUTE@@@trace@@@1@@@1@@@cache@@@trace the IP path to <ip 
address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_ROUTE@@@show ip route@@@1@@@1@@@cache@@@show the current IP routing table 
for <ip address>@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
-IP_MULTICAST_BGP_TABLE@@@show ip bgp IP multicast@@@1@@@1@@@cache@@@display 
IP multicast table@@@<prefix> [<length>]@@@.*
+IP_MULTICAST_BGP_TABLE@@@show ip bgp ipv4 
multicast@@@1@@@1@@@cache@@@display IP multicast table@@@<prefix> 
[<length>]@@@.*
 IP_MULTICAST_ROUTE@@@show ip mroute@@@1@@@1@@@cache@@@display multicast 
forwarding state@@@<ip 
address>@@@^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(\/[0-9]{1,2})?$
 IP_MULTICAST_SDP_SUM@@@show ip msdp sum@@@0@@@0@@@cache@@@display MSDP peer 
status@@@---@@@---
 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 summary@@@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})?$
-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_TRACEROUTE@@@trace IPv6@@@1@@@1@@@cache@@@trace the IPv6 path to <IPv6 
address>@@@<IPv6 
address>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 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})$
 IPv6_MULTICAST_BGP_TABLE@@@show BGP IPv6 multicast@@@1@@@1@@@cache@@@display 
IPv6 multicast table@@@<IPv6 
prefix/length>@@@^([A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}(/[0-9]{1,3})?$
 IPv6_MULTICAST_ROUTE@@@show IPv6 mroute@@@1@@@1@@@cache@@@display multicast 
IPv6 forwarding state@@@---@@@---

Added: branches/geant2_java-sshtelnet-mp-STABLE/doc/License.txt

Added: 
branches/geant2_java-sshtelnet-mp-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf


Property changes on: 
branches/geant2_java-sshtelnet-mp-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/changelog
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/changelog    
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/changelog    
2009-01-13 14:32:12 UTC (rev 4870)
@@ -1,3 +1,10 @@
+ps-mdm-sshtelnet-mp (1.3.4) stable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.3c
+  
+ -- Stijn Melis 
<>
  Tue, 13 Jan 2009 11:35:09 +0200
+
 ps-mdm-sshtelnet-mp (1.3.4RC8) unstable; urgency=low
 
   * ps-base version: 1.0.20080902

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/copyright
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/copyright    
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/copyright    
2009-01-13 14:32:12 UTC (rev 4870)
@@ -1,30 +1,24 @@
-This package was debianized by Gijs Molenaar 
<>
 on
-Tue, 29 Apr 2008 14:10:17 +0200.
-
-It was downloaded from http://www.perfsonar.net
-
-Upstream Author(s): 
-
-    Hans Trompert 
<>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2008, Gijs Molenaar 
<>
 and
-is licensed under the GPL, see above.
\ No newline at end of file
+* Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the DANTE or GEANT2 nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY DANTE ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL DANTE or the GEANT2 NRENS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/docs
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/docs 2009-01-13 
14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/docs 2009-01-13 
14:32:12 UTC (rev 4870)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC8/doc/*
\ No newline at end of file
+ps-mdm-sshtelnet-mp-1.3.4/doc/*
\ No newline at end of file

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/files
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/files        
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/files        
2009-01-13 14:32:12 UTC (rev 4870)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp_1.3.4RC8_all.deb web extra
+ps-mdm-sshtelnet-mp_1.3.4_all.deb web extra

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/install
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/install      
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/install      
2009-01-13 14:32:12 UTC (rev 4870)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC8/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+ps-mdm-sshtelnet-mp-1.3.4/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/postinst
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/postinst     
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/postinst     
2009-01-13 14:32:12 UTC (rev 4870)
@@ -23,7 +23,6 @@
     ln -sf /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5.5/webapps/ps-mdm-sshtelnet-mp
     ln -sf 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
 /etc/ps-mdm-sshtelnet-mp || true
     ln -sf /var/log/tomcat5.5 /var/log/ps-mdm-sshtelnet-mp 
-    unlink 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/ps-mdm-sshtelnet-mp
     chown tomcat55 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
     chown tomcat55 -R 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/
     /etc/init.d/tomcat5.5 restart

Modified: branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/rules
===================================================================
--- branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/rules        
2009-01-13 14:29:54 UTC (rev 4869)
+++ branches/geant2_java-sshtelnet-mp-STABLE/packaging/deb/rules        
2009-01-13 14:32:12 UTC (rev 4870)
@@ -17,7 +17,7 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       ant -f ps-mdm-sshtelnet-mp-1.3.4RC8/ant/build.xml 
webapp-package-create
+       ant -f ps-mdm-sshtelnet-mp-1.3.4/ant/build.xml webapp-package-create
 
        touch $@
 

Modified: 
branches/geant2_java-sshtelnet-mp-STABLE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-STABLE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
    2009-01-13 14:29:54 UTC (rev 4869)
+++ 
branches/geant2_java-sshtelnet-mp-STABLE/packaging/rpm/ps-mdm-sshtelnet-mp.specs
    2009-01-13 14:32:12 UTC (rev 4870)
@@ -6,8 +6,8 @@
 Name: ps-mdm-sshtelnet-mp
 
 # Version of the microrelease
-Version: 1.3.4RC8
-License: GPL
+Version: 1.3.4
+License: Modified BSD License 
 
 # Package version. Increment if you create a new package of same microrelease
 Release: 1
@@ -93,7 +93,6 @@
 ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*.xml
 /etc/ps-mdm-sshtelnet-mp
 ln -s /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5/webapps/ps-mdm-sshtelnet-mp
 ln -s /var/log/tomcat5 /var/log/ps-mdm-sshtelnet-mp
-unlink /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/ps-mdm-sshtelnet-mp
 ## restart tomcat
 /sbin/service tomcat5 restart
 chown tomcat:tomcat -R 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/
@@ -135,6 +134,10 @@
 
 
 %changelog
+* Tue Jan 13 2009 Stijn Melis 
<>
 1.3.4
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.3c
+
 * Fri Dec 19 2008 Stijn Melis 
<>
 1.3.4RC8
 - ps-base version: 1.0.20080902
 - web-admin version: 0.9.3c