perfsonar development work

Author: melis
Date: 2007-08-24 09:19:34 -0400 (Fri, 24 Aug 2007)
New Revision: 2719

Modified:
   trunk/perfsonar/ant/const.properties
   trunk/perfsonar/ant/const.properties.mp.ssh
   trunk/perfsonar/ant/cost.properties.mp.ssh
   trunk/perfsonar/ant/ssh/sshtelnetMP-configure-targets.xml
   trunk/perfsonar/ant/ssh/sshtelnetMP-pre-install-targets.xml
Log:
changed version number for SSHTELNET MP from 1.2_RC2 to 1.2
added the AuthN implementation

Modified: trunk/perfsonar/ant/const.properties
===================================================================
--- trunk/perfsonar/ant/const.properties        2007-08-24 13:08:53 UTC (rev 
2718)
+++ trunk/perfsonar/ant/const.properties        2007-08-24 13:19:34 UTC (rev 
2719)
@@ -1,4 +1,4 @@
 #This file was created by the Ant configuration script.
-#Mon Aug 13 14:40:00 CEST 2007
-service.name=JAVA-SSHTELNET-MP-1.2_RC2
+#Wed Aug 22 11:30:46 CEST 2007
+service.name=JAVA-SSHTELNET-MP-1.2
 build=build

Modified: trunk/perfsonar/ant/const.properties.mp.ssh
===================================================================
--- trunk/perfsonar/ant/const.properties.mp.ssh 2007-08-24 13:08:53 UTC (rev 
2718)
+++ trunk/perfsonar/ant/const.properties.mp.ssh 2007-08-24 13:19:34 UTC (rev 
2719)
@@ -4,11 +4,11 @@
 target.port=8080
 api.windowtitle=perfSONAR
 release.basename=perfSONAR
-deploy.root=perfSONAR-SSHTelnet-MP-1.2_RC2
-service.name=JAVA-SSHTELNET-MP-1.2_RC2
+deploy.root=perfSONAR-SSHTelnet-MP-1.2
+service.name=JAVA-SSHTELNET-MP-1.2
 api.bottom=JRA1 GEANT2 Project
 wsdd.path=org/perfsonar/service/web/wsdd
-release.servicename=perfSONAR-SSHTelnet-MP-1.2_RC2
+release.servicename=perfSONAR-SSHTelnet-MP-1.2
 build=build
 api.title=perfSONAR
 tomcat.home=/opt/apache-tomcat-5.5.20
@@ -17,6 +17,6 @@
 api.location=doc/api
 wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
 webservice.name=MeasurementPointService
-release.version=1.2_RC2
+release.version=1.2
 wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
 target.server=localhost

Modified: trunk/perfsonar/ant/cost.properties.mp.ssh
===================================================================
--- trunk/perfsonar/ant/cost.properties.mp.ssh  2007-08-24 13:08:53 UTC (rev 
2718)
+++ trunk/perfsonar/ant/cost.properties.mp.ssh  2007-08-24 13:19:34 UTC (rev 
2719)
@@ -4,11 +4,11 @@
 target.port=8080
 api.windowtitle=perfSONAR
 release.basename=perfSONAR
-deploy.root=perfSONAR-SSHTelnet-MP-1.2_RC2
-service.name=JAVA-SSHTELNET-MP-1.2_RC2
+deploy.root=perfSONAR-SSHTelnet-MP-1.2
+service.name=JAVA-SSHTELNET-MP-1.2
 api.bottom=JRA1 GEANT2 Project
 wsdd.path=org/perfsonar/service/web/wsdd
-release.servicename=perfSONAR-SSHTelnet-MP-1.2_RC2
+release.servicename=perfSONAR-SSHTelnet-MP-1.2
 build=build
 api.title=perfSONAR
 tomcat.home=/opt/apache-tomcat-5.5.20
@@ -17,6 +17,6 @@
 api.location=doc/api
 wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
 webservice.name=MeasurementPointService
-release.version=1.2_RC2
+release.version=1.2
 wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
 target.server=localhost

Modified: trunk/perfsonar/ant/ssh/sshtelnetMP-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/ssh/sshtelnetMP-configure-targets.xml   2007-08-24 
13:08:53 UTC (rev 2718)
+++ trunk/perfsonar/ant/ssh/sshtelnetMP-configure-targets.xml   2007-08-24 
13:19:34 UTC (rev 2719)
@@ -68,7 +68,7 @@
                  <entry key="service.as.authn_active" value="on"/>
                  <entry key="service.as.authn_for_msg_types" 
value="SetupDataRequest,MetadataKeyRequest,EchoRequest"/>
                  <entry key="service.as.point" 
value="http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService"/>
-                 <entry key="service.as.authnRequest" 
value="schema/example-instances/perfSONAR/AS/test/AuthNRequest.xml"/>
+                 <entry key="service.as.authnRequest" 
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/AuthNRequest.xml"/>
          
         </propertyfile>
 

Modified: trunk/perfsonar/ant/ssh/sshtelnetMP-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/ssh/sshtelnetMP-pre-install-targets.xml 2007-08-24 
13:08:53 UTC (rev 2718)
+++ trunk/perfsonar/ant/ssh/sshtelnetMP-pre-install-targets.xml 2007-08-24 
13:19:34 UTC (rev 2719)
@@ -17,7 +17,7 @@
 
 <project name="sshtelnetmp-pre-install-targets">
 
-    <property name="service.name" value="JAVA-SSHTELNET-MP-1.2_RC2" />
+    <property name="service.name" value="JAVA-SSHTELNET-MP-1.2" />
 
     <property file="ant/const.properties" />