perfsonar development work

Author: uros
Date: 2007-10-08 05:31:06 -0400 (Mon, 08 Oct 2007)
New Revision: 2921

Modified:
   
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template
   branches/new-structure/trunk/geant2_java-tc-mp/ant/pre-install-targets.xml
Log:
Fix the service name to predefined values. Reason for this is clash with 
service.r.* service.properties entries which are needed for accessing 
tracefiles via HTTP.

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template  
      2007-10-08 09:22:14 UTC (rev 2920)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template  
      2007-10-08 09:31:06 UTC (rev 2921)
@@ -8,7 +8,8 @@
 
 target.server=127.0.0.1
 
-service.name=perfSONAR-TCMP
+deploy.root=perfSONAR-TCMP-1.0-beta
+service.name=perfSONAR-TCMP-1.0-beta
 
 jarfilename=perfsonar-tc-mp
 version=1.0-beta

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/ant/pre-install-targets.xml  
2007-10-08 09:22:14 UTC (rev 2920)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/ant/pre-install-targets.xml  
2007-10-08 09:31:06 UTC (rev 2921)
@@ -191,8 +191,12 @@
     <psbase:template-use template-file="conf/service.properties.template"
                          dest-file="conf/service.properties"/>
 
+    <!-- Disabled so it does not clash with tracefile HTTP access subroutines
+
     <psbase:get-service-name 
default-service-name="${service.name}-${version}"
                              dest-config-file="ant/const.properties"/>
+    -->
+
     <psbase:get-service-home dest-config-file="ant/const.properties"/>
     <psbase:get-tomcat dest-config-file="ant/const.properties"
                        
tomcat-download-url="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&amp;version=6.0.7";