perfsonar development work

Author: mac
Date: 2007-02-05 10:16:03 -0500 (Mon, 05 Feb 2007)
New Revision: 2027

Modified:
   branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml
Log:
A couple of changes, i.a. 
- "perfSONAR-XML-LS-1.1-RC2/perfsonar" is now a 'root' directory in tarball
- various bug fixes (mostly posted by Chris)
- support for non-root user installation






Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml    2007-02-02 
14:00:33 UTC (rev 2026)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml    2007-02-05 
15:16:03 UTC (rev 2027)
@@ -86,11 +86,12 @@
         <echo>into Tomcat configuration file server.xml</echo>
         <echo>(${tomcat.home}/conf/server.xml)</echo>
         <echo>inside existing xml tag 'Host':</echo>
+        <echo/>
+       <echo>(You may copy XML part (without [echo]): </echo>
+        <echo message="    &lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;"/>
+        <!-- echo message="        
docBase='${service.home}/${service.name}'&gt;"/ -->
+        <!-- echo message="    &lt;/Context&gt;"/ -->
         <echo></echo>
-        <echo message="    &lt;Context path='/${deploy.root}'"/>
-        <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
-        <echo message="    &lt;/Context&gt;"/>
-        <echo></echo>
         <echo>Please, do it now. I will wait for you.</echo>
         <input message="Press Return key ..."/>
 

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml       
2007-02-02 14:00:33 UTC (rev 2026)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml       
2007-02-05 15:16:03 UTC (rev 2027)
@@ -20,7 +20,6 @@
     <!-- property name="tomcat.download.url"
               value="http://monstera.man.poznan.pl/tomcat.tar.gz"; /-->
 
-    <property name="tomcat.tempdir" value="/tmp/temp" />
     <property name="tomcat.tempfile" value="apache-tomcat-5.5.20"/> <!-- 
without .tar.gz -->
 
     <target name="get-inputs">
@@ -41,6 +40,11 @@
                addproperty="tomcat.home"
                defaultvalue="${default_tomcat.home}" />
 
+        <property name="default_tomcat.tempdir" value="/home/mac/temp"/>
+       <input message="Temporary directory [${default_tomcat.tempdir}]?"
+              addproperty="tomcat.tempdir"
+              defaultvalue="${default_tomcat.tempdir}"/>                     
                       
+
         <property name="default_hostname" value="localhost"/>
         <input message="Enter webserver hostname (please type your host and 
domain name - not localhost)"
                addproperty="target.server"
@@ -96,6 +100,8 @@
 
         <echo>Download Tomcat</echo>
         <property name="tomcat.tar" 
value="${tomcat.tempdir}/${tomcat.tempfile}.tar.gz"/>
+       
+        <mkdir dir="${tomcat.tempdir}"/>       
         <get src="${tomcat.download.url}"
                 dest="${tomcat.tar}"
                 verbose="true"

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml   2007-02-02 
14:00:33 UTC (rev 2026)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml   2007-02-05 
15:16:03 UTC (rev 2027)
@@ -18,11 +18,17 @@
     </target>
 
     <target name="ask-for-values">
+
         <property name="release-file" value="perfSONAR-XML-LS"/>
-        <property name="release-number" value="1.1-RC1"/>
-        <property name="release-dir" 
value="${basedir}/release/${release-file}-${release-number}"/> <!-- 
$BASEDIR/release/perfSONAR-XML-LS-1.1/-->
+
+        <property name="default_release-number" value="1.1-RC1"/>
+       <input addproperty="release-number" message="Enter release number 
[${default_release-number}" defaultvalue="${default_release-number}"/>
+
+        <property name="release-dir" 
value="${basedir}/release/${release-file}-${release-number}/perfsonar"/> <!-- 
$BASEDIR/release/perfSONAR-XML-LS-1.1/perfsonar-->
+
         <echo>Path for release is: [${release-dir}]</echo>
         <echo>Release file is: 
[${release-file}-${release-number}.tar.gz]</echo>
+       
 
     </target>