perfsonar development work

Author: melis
Date: 2007-03-16 12:15:44 -0400 (Fri, 16 Mar 2007)
New Revision: 2247

Modified:
   branches/SSHTelnet-MP-RELEASE/ant/const.properties
   branches/SSHTelnet-MP-RELEASE/ant/const.properties.mp
   branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml
   branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-release-targets.xml
Log:
Bring release branch up to date with stable branch

Modified: branches/SSHTelnet-MP-RELEASE/ant/const.properties
===================================================================
--- branches/SSHTelnet-MP-RELEASE/ant/const.properties  2007-03-16 16:12:17 
UTC (rev 2246)
+++ branches/SSHTelnet-MP-RELEASE/ant/const.properties  2007-03-16 16:15:44 
UTC (rev 2247)
@@ -1,12 +1,11 @@
 #This file was created by the Ant configuration script.
-#Wed Feb 14 10:26:51 CET 2007
+#Wed Mar 14 15:46:22 CET 2007
 package.root=org/perfsonar
-
 target.port=8080
 api.windowtitle=perfSONAR
 release.basename=perfSONAR
 deploy.root=perfSONAR-SSHTelnet-MP-1.0
-service.name=perfSONAR-SSHTelnet-MP-1.0
+service.name=JAVA-SSHTELNET-MP-1.0
 api.bottom=JRA1 GEANT2 Project
 wsdd.path=org/perfsonar/service/web/wsdd
 release.servicename=perfSONAR-SSHTelnet-MP-1.0
@@ -19,5 +18,5 @@
 wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
 webservice.name=MeasurementPointService
 release.version=1.0
-wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
 target.server=localhost
+wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd

Modified: branches/SSHTelnet-MP-RELEASE/ant/const.properties.mp
===================================================================
--- branches/SSHTelnet-MP-RELEASE/ant/const.properties.mp       2007-03-16 
16:12:17 UTC (rev 2246)
+++ branches/SSHTelnet-MP-RELEASE/ant/const.properties.mp       2007-03-16 
16:15:44 UTC (rev 2247)
@@ -1,59 +1,22 @@
-#
-# The file containing variables for ant script 'buid.xml'
-#
-# $Id$
-#
-# Project: perfSONAR
-#
-
-### -------------- The following entries require changes from the user 
----------------
-
-# the path to Tomcat deployment:
-tomcat.home=/home/loukik/perfSONAR-NMS_MP-bin-beta1/jakarta-tomcat-5.0.28
-
-# the path to Axis deployment:
-axis.home=/home/loukik/perfSONAR-NMS_MP-bin-beta1/jakarta-tomcat-5.0.28/webapps/axis
-
-# host name of the server where the service is being installed
-target.server=mu.dante.org.uk
-
-# port number on the server where the web service can be accessed = port 
number where tomcat is listening
+#This file was created by the Ant configuration script.
+#Wed Mar 14 15:46:22 CET 2007
+package.root=org/perfsonar
 target.port=8080
-
-# location of axis admin service. typically 
http://targer.server:port/axis/services/AdminService
-# derive this information from using the example given above
-adminService=http://mu.dante.org.uk:8080/axis/services/AdminService
-
-#jdk path location - java 1.5 needed. Make sure the path below is the actual 
path and not a symbolic link
-jdk_path=/net/dante-sw/opt/jdk1.5.0_01
-
-
-
-
-### -------------- The following entries DO NOT require any changes 
-----------
-
+api.windowtitle=perfSONAR
+release.basename=perfSONAR
+deploy.root=perfSONAR-SSHTelnet-MP-1.0
+service.name=JAVA-SSHTELNET-MP-1.0
+api.bottom=JRA1 GEANT2 Project
+wsdd.path=org/perfsonar/service/web/wsdd
+release.servicename=perfSONAR-SSHTelnet-MP-1.0
 build=build
-package.root=org/perfsonar
-package.nmwg.root=org/ggf
+api.title=perfSONAR
+tomcat.home=/opt/apache-tomcat-5.5.20
 wsdd.home=service/web/wsdd
-
-# name of deployed webservice
-webservice.name=MeasurementPointService
-
-# the name of the wsdd file containing deployment information
-wsdd.file.deploy=mp-service-deploy.wsdd
-wsdd.file.undeploy=mp-service-undeploy.wsdd
-
-# the path where wsdd file is stored
-wsdd.path=org/perfsonar/service/web/wsdd
-
-### Javadoc params
+package.nmwg.root=org/ggf
 api.location=doc/api
-api.title=perfSONAR
-api.windowtitle=perfSONAR
-api.bottom=The perfSONAR Project
-
-### information which are taken to create release file - the user need not 
change any of these
-release.basename=perfSONAR
-release.servicename=NMS_MP
-release.version=beta1
+wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
+webservice.name=MeasurementPointService
+release.version=1.0
+target.server=localhost
+wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd

Modified: 
branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml 
  2007-03-16 16:12:17 UTC (rev 2246)
+++ branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml 
  2007-03-16 16:15:44 UTC (rev 2247)
@@ -96,7 +96,6 @@
             error="${basedir}/log/tomcat.log">
             <arg line="startup.sh"/>
             <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
-            <env key="LD_LIBRARY_PATH" 
path="${env.LD_LIBRARY_PATH}:${rrd_lib_path}:${rrdjdir}/build"/>
         </exec>
 
         <echo>Please, make sure that the Tomcat is running. Use the address 
http://${target.server}:${target.port} .</echo>
@@ -119,18 +118,6 @@
         <echo>Please, do it now. I will wait for you.</echo>
         <input message="Press Return key ..."/>
 
-
-        <echo>${line.separator}You have to manually set up the env variable 
LD_LIBRARY_PATH</echo>
-        <echo>which should be seen by the Tomcat instance.</echo>
-        <echo></echo>
-        <echo>After setting up the variable (re)start the Tomcat.</echo>
-
-        <echo>${line.separator}Example:</echo>
-        <echo>  export 
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrdtool_path}/lib:${rrdjdir}/build</echo>
-        <echo>${line.separator} Please, do it now. I will wait for 
you.</echo>
-
-        <input message="Press Return key ..."/>
-
     </target>
 
     <target name="tomcat-start-for-sshtelnetmp"

Modified: 
branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-release-targets.xml
===================================================================
--- branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-release-targets.xml     
  2007-03-16 16:12:17 UTC (rev 2246)
+++ branches/SSHTelnet-MP-RELEASE/ant/ssh/sshtelnetMP-release-targets.xml     
  2007-03-16 16:15:44 UTC (rev 2247)
@@ -77,10 +77,6 @@
 
        <delete dir="tmp/${service.name}/perfsonar/conf/template"/>
 
-       <delete dir="tmp/${service.name}/perfsonar/lib/rrd"/>
-          <delete dir="tmp/${service.name}/perfsonar/lib/repository"/>
-          <mkdir dir="tmp/${service.name}/perfsonar/lib/repository"/>
-          
        <move file="tmp/${service.name}/perfsonar/ant/build-sshtelnet.xml" 
tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>
 
        <delete>