perfsonar development work

Author: mac
Date: 2007-03-23 11:31:35 -0400 (Fri, 23 Mar 2007)
New Revision: 2278

Modified:
   trunk/perfsonar/ant/xmlls/deploy-targets.xml
   trunk/perfsonar/ant/xmlls/pre-install-targets.xml
   trunk/perfsonar/ant/xmlls/pre-install-targets.xml~
   trunk/perfsonar/ant/xmlls/undeploy-targets.xml
Log:
Removed adding context listener in web.xml by XSLT. Using prepared web.xml 
instead.



Modified: trunk/perfsonar/ant/xmlls/deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/deploy-targets.xml        2007-03-23 12:30:42 
UTC (rev 2277)
+++ trunk/perfsonar/ant/xmlls/deploy-targets.xml        2007-03-23 15:31:35 
UTC (rev 2278)
@@ -6,13 +6,20 @@
     <!-- the main targets -->
 
 
+<!--
+    ==commented because XSLT doesn't work for some users, why?==
     <target name="deploy"
             depends="
                 copy-xmlls-jar,
                 copy-other-files,
                 add-context-listener"
             description="Deploys RRD MA service">
-
+-->
+    <target name="deploy"
+            depends="
+                copy-xmlls-jar,
+                copy-other-files"
+            description="Deploys RRD MA service">
         <echo>Deploying the service...</echo>
         <antcall target="tomcat-start-for-xmlls" />
         <!-- antcall target="xmldb-adduser-xmlls" /-->
@@ -88,7 +95,7 @@
         <echo>inside existing xml tag 'Host':</echo>
         <echo/>
        <echo>(You may copy XML part (without [echo]): </echo>
-        <echo>&lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;"</echo>
+        <echo>&lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;</echo>
         <!-- echo message="        
docBase='${service.home}/${service.name}'&gt;"/ -->
         <!-- echo message="    &lt;/Context&gt;"/ -->
         <echo></echo>
@@ -121,7 +128,7 @@
         <echo>inside existing xml tag 'Host':</echo>
         <echo/>
        <echo>(You may copy XML part (without [echo]): </echo>
-        <echo>&lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;"</echo>
+        <echo>&lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;</echo>
         <echo/>
         <echo>Please, do it now. I will wait for you.</echo>
         <input message="Press Return key ..."/>

Modified: trunk/perfsonar/ant/xmlls/pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/pre-install-targets.xml   2007-03-23 12:30:42 
UTC (rev 2277)
+++ trunk/perfsonar/ant/xmlls/pre-install-targets.xml   2007-03-23 15:31:35 
UTC (rev 2278)
@@ -50,7 +50,7 @@
         <input message="Do you want to proceed? Just press ENTER to 
continue. Otherwise CTRL-C stops the process immediately"/>
 
         <echo>Preparing the installation of XML Lookup Service...</echo>
-        <delete file="${basedir}/ant/const.properties" />
+        <delete file="ant/const.properties" />
         <echo></echo>
         <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
         <echo></echo>

Modified: trunk/perfsonar/ant/xmlls/pre-install-targets.xml~
===================================================================
--- trunk/perfsonar/ant/xmlls/pre-install-targets.xml~  2007-03-23 12:30:42 
UTC (rev 2277)
+++ trunk/perfsonar/ant/xmlls/pre-install-targets.xml~  2007-03-23 15:31:35 
UTC (rev 2278)
@@ -3,31 +3,66 @@
 
 
     <target name="pre-install"
-            depends="init-info,
+            depends="show-info,
             get-inputs,
             confirm-inputs,
             get-tomcat,
             copy-const-properties
             ">
-
     </target>
 
 
+    <!-- Official Tomcat -->
 
-    <!--property name="tomcat.download.url"
-              
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
 /-->
     <property name="tomcat.download.url"
-                 
value="http://monstera.man.poznan.pl/private/bak/apache-tomcat-5.5.20.tar.gz"; 
/>
+              
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&amp;version=6.0.7";
 />
+
+
     <!-- property name="tomcat.download.url"
+                 
value="http://monstera.man.poznan.pl/private/bak/apache-tomcat-5.5.20.tar.gz"; 
/-->
+    <!-- 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 -->
+    <property name="tomcat.tempfile" value="apache-tomcat-6.0.7"/> <!-- 
without .tar.gz -->
 
+    <property environment="env"/> <!-- env variables -->
+
+    <target name="show-info">
+        <echo>Pre-install</echo>
+        <echo/>
+        <echo>---- Welcome in perfSONAR LookupService installation script 
----</echo>
+        <echo/>
+        <echo>You're about to install LookupService that may be also called 
LS during the installation process.</echo>
+        <!--
+            <echo>The installation guide is accessible on 
http://wiki.perfsonar.net/jra1-wiki/index.php/Installation_LS_1.1#Lookup_service_installation
 web page</echo>
+        -->
+        <echo/>
+        <echo>Requirements:</echo>
+        <echo/>
+        <echo> 1. Java 1.5.x</echo>
+        <echo> 2. Ant 1.6.x (we're sure you've already got it installed as 
you run the installation process)</echo>
+        <echo> 3. eXist DB XML - see Exist DB Installation Guide for 
LS:</echo>
+        <echo>     
http://wiki.perfsonar.net/jra1-wiki/index.php/Exist_DB_Installation_Guide_for_LS</echo>
+        <echo> 4. JAVA_HOME environment variable set to your Java 
directory</echo>
+        <echo>    Now, your JAVA_HOME is [${env.JAVA_HOME}]</echo>
+        <echo/>
+
+        <input message="Do you want to proceed? Just press ENTER to 
continue. Otherwise CTRL-C stops the process immediately"/>
+
+        <echo>Preparing the installation of XML Lookup Service...</echo>
+        <delete file="${basedir}/ant/const.properties" />
+        <echo></echo>
+        <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
+        <echo></echo>
+
+
+    </target>
+
     <target name="get-inputs">
         <!-- tomcat -->
 
-        <input message="Do you want to install Tomcat webserver?"
+
+        <input message="Do you want to download Tomcat webserver 
automatically (say N if you've already got Tomcat)?"
                addproperty="tomcat.install.answer"
                validargs="y,n"
                defaultvalue="n"/>
@@ -38,29 +73,51 @@
         </condition>
 
         <property name="default_tomcat.home" value="/usr/local/tomcat_ls"/>
-        <input message="Enter webserver home directory 
[${default_tomcat.home}]"
+        <input message="Enter webserver (Tomcat) home directory. If answered 
Y for previous question, this directory will be the target directory where to 
install Tomcat. If answered N, Tomcat will be installed there 
[${default_tomcat.home}]"
                addproperty="tomcat.home"
                defaultvalue="${default_tomcat.home}" />
 
+        <property name="default_tomcat.tempdir" value="${basedir}/tmp"/>
+        <!--
+        <input message="Temporary directory [${default_tomcat.tempdir}]?"
+               addproperty="tomcat.tempdir"
+               defaultvalue="${default_tomcat.tempdir}"/>
+        -->
+        <property name="tomcat.tempdir" value="${default_tomcat.tempdir}" 
/><!-- don't ask for tmp -->
+
+        <!--
         <property name="default_hostname" value="localhost"/>
         <input message="Enter webserver hostname (please type your host and 
domain name - not localhost)"
                addproperty="target.server"
                defaultvalue="${default_hostname}" />
+        -->
+        <property name="target.server" value="127.0.0.1"/> <!-- localhost to 
avoid use AdminClient on remote host; it fails if not enabled in tomcat 
configuration -->
 
         <property name="default_target.port" value="8080"/>
         <input message="Enter webserver port [${default_target.port}]"
                addproperty="target.port"
                defaultvalue="${default_target.port}" />
 
-        <property name="default_service.home" value="${basedir}"/>
-        <input message="Enter service directory (where to be installed) 
[${default_service.home}]"
+        <!-- directories -->
+
+        <dirname property="basedirUp" file="${basedir}" /> <!-- ../ -->
+        <dirname property="basedirUpUp" file="${basedirUp}" /> <!-- ../../ 
-->
+        <basename property="owndir" file="${basedirUp}" /> <!-- 
XML-LS-v.w(-RCx) -->
+
+        <property name="default_in.deploy.root" value="${owndir}"/>
+        <property name="deploy.root" value="${default_in.deploy.root}"/> 
<!-- don't ask for deploy root -->
+        <!--
+            <input message="Enter service deployment name 
[${default_in.deploy.root}]"
+                   addproperty="deploy.root"
+                   defaultvalue="${default_in.deploy.root}" />
+        -->
+
+        <property name="default_service.home" 
value="${basedirUpUp}/webapps"/>
+        <input message="Service directory is suffix is [${deploy.root}]. 
Enter service prefix directory (where target directory ${deploy.root} will be 
installed) Default is [${default_service.home}]"
                addproperty="service.home"
                defaultvalue="${default_service.home}" />
 
-        <property name="default_in.deploy.root" value="LookupService"/>
-        <input message="Enter service deployment name 
[${default_in.deploy.root}]"
-               addproperty="deploy.root"
-               defaultvalue="${default_in.deploy.root}" />
+
     </target>
 
     <target name="confirm-inputs">
@@ -68,8 +125,9 @@
         <echo message="Your settings: "/>
         <echo 
message="---------------------------------------------------------------"/>
 
-        <echo message="Tomcat home directory [${tomcat.home}]" />
-        <echo message="Service address 
[http://${target.server}:${target.port}/${deploy.root}]"/>
+        <echo message="Tomcat home directory: [${tomcat.home}]" />
+        <echo message="Tomcat address: 
[http://${target.server}:${target.port}/${deploy.root}]"/>
+        <echo message="Service destination directory: 
[${service.home}/${deploy.root}]"/>
 
         <input message="Proceed with these settings? "
                validargs="y,n"
@@ -81,22 +139,13 @@
         <fail if="do.abort">Files have not been modified. Configure the 
service manually by editing configuration files, or run configurator 
again.</fail>
     </target>
 
-    <target name="init-info">
-        <echo>Pre-install</echo>
-
-        <echo>Preparing the installation of XML Lookup Service...</echo>
-
-        <echo></echo>
-        <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
-            <echo></echo>
-    </target>
-
-
     <!-- INFO: download Tomcat if necessary -->
     <target name="get-tomcat" if="tomcat.install.decision">
 
         <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"
@@ -147,4 +196,4 @@
 
 
     </target>
-</project>
\ No newline at end of file
+</project>

Modified: trunk/perfsonar/ant/xmlls/undeploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/undeploy-targets.xml      2007-03-23 12:30:42 
UTC (rev 2277)
+++ trunk/perfsonar/ant/xmlls/undeploy-targets.xml      2007-03-23 15:31:35 
UTC (rev 2278)
@@ -7,7 +7,10 @@
 
         <antcall target="undeploy-adminclient" />
 
+        <!-- XSLT doesn't work for all users
         <antcall target="rem-context-listener" />
+        -->
+        
         <antcall target="delete-jars-for-xmlls"/>
 
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>