perfsonar development work

[Roman Lapacz <>]

 wrote:
> Author: fernandes
> Date: 2007-01-16 08:32:40 -0500 (Tue, 16 Jan 2007)
> New Revision: 1914
>
> Modified:
>    branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml
>    branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml
>    branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml
>    branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-libs-download-targets.xml
>    branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-pre-install-targets.xml
>    branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml
>    branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml
> Log:
> CLMP Targets modification for RC1
>   

Hi

I see you've done some changes in the general Ant files. Could you 
describe them and intentions?

Roman




> Modified: branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml 2007-01-15 
> 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml 2007-01-16 
> 13:32:40 UTC (rev 1914)
> @@ -73,8 +73,10 @@
>          <copy file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"        
>      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
>          <copy 
> file="./lib/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"  
> todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
>          <copy 
> file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"    
> todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -
> -
> +        <copy 
> file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"        
>     todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> +        <copy 
> file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" 
>     todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> +        <copy 
> file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
>    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> +        
>          <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"                           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
>          <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"                   
>      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
>          <copy file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"        
>      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> @@ -99,7 +101,10 @@
>          <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
>          <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-discovery-0.2.jar"/>
>          <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
> -
> +        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
> +        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
> +        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-collections-3.2.jar"/>
> +        
>          <delete file="${service.home}/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
>          <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
>          <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
> @@ -121,7 +126,7 @@
>      <target name="delete-axis-for-service">
>  
>          <delete file="${service.home}/${deploy.root}/fingerprint.jsp"/>
> -        <delete file="${service.home}/${deploy.root}happyaxis.jsp"/>
> +        <delete file="${service.home}/${deploy.root}/happyaxis.jsp"/>
>          <delete file="${service.home}/${deploy.root}/i18nLib.jsp"/>
>          <delete file="${service.home}/${deploy.root}/index.html"/>
>          <delete file="${service.home}/${deploy.root}/index.jsp"/>
> @@ -224,6 +229,8 @@
>              error="${basedir}/log/tomcat.log">
>              <arg line="startup.sh"/>
>              <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
> +            <env key="CATALINA_HOME" path=""/>
> +            <env key="CATALINA_BASE" path=""/>
>          </exec>
>  
>      </target>
> @@ -296,5 +303,19 @@
>      </target>
>  
>  
> +    <target name="start">
> +        
> +        <antcall target="deploy-adminclient" />
> +        
> +    </target>
>  
> -</project>
> \ No newline at end of file
> +
> +    <target name="stop">
> +
> +        <antcall target="undeploy-adminclient" />
> +
> +    </target>
> +
> +
> +
> +</project>
>
> Modified: 
> branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml     
>   2007-01-15 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml     
>   2007-01-16 13:32:40 UTC (rev 1914)
> @@ -21,14 +21,6 @@
>  
>      <target name="copy-jars-for-clmp" depends="copy-jars-for-service">
>  
> -        <copy file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -        <copy 
> file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" 
>     todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -        <copy 
> file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
>    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -
> -        <copy file="./lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"                
>                       todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -        <copy file="./lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"      
>                       todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -        <copy file="./lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"        
>                       todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
> -
>          <copy file="./conf/wsdd/${wsdd.file.deploy}"                                      
>                       todir="${service.home}/${deploy.root}/wsdd"/>
>          <copy file="./conf/wsdd/${wsdd.file.undeploy}"                                    
>                       todir="${service.home}/${deploy.root}/wsdd"/>
>  
> @@ -37,14 +29,6 @@
>  
>      <target name="delete-jars-for-clmp" depends="delete-jars-for-service">
>  
> -        <delete file="${service.home}/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
> -        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
> -        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/commons-collections-3.2.jar"/>
> -
> -        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-8.7.jar"/>
> -        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
> -        <delete 
> file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-dom-8.7.jar"/>
> -
>          <delete file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" 
> />
>          <delete 
> file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
>  
>
> Modified: branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml 
> 2007-01-15 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml 
> 2007-01-16 13:32:40 UTC (rev 1914)
> @@ -15,27 +15,17 @@
>  <project name="clmp-configure-targets">
>  
>  
> -
> -    <property name="service.name" value="perfSONAR-CLMP-1.1-beta" />
> +    <property file="ant/const.properties" />
>      <property name="deploy.root" value="${service.name}" />
>  
>  
> -    <!-- creating const.properties file -->
>  
> +    <target name="set-const-properties-for-clmp">
>  
> -    <target name="set-const-properties-for-clmp"
> -            depends="get-server-address,
> -                     get-server-port,
> -                     get-tomcat-directory">
> -
>          <propertyfile file="ant/const.properties" 
>                        comment="This file was created by the Ant configuration script.">
>  
> -            <entry  key="service.name" value="${service.name}"/>
>              <entry  key="deploy.root" value="${deploy.root}"/>
> -            <entry  key="tomcat.home" value="${tomcat.install.location}"/>
> -            <entry  key="target.server" value="${server.address}"/>
> -            <entry  key="target.port" value="${server.port}"/>
>              <entry  key="webservice.name" value="CommandLineService"/>
>              <entry  key="build" value="build"/>
>              <entry  key="package.root" value="org/perfsonar"/>
>
> Modified: 
> branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-libs-download-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-libs-download-targets.xml   
>   2007-01-15 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-libs-download-targets.xml   
>   2007-01-16 13:32:40 UTC (rev 1914)
> @@ -23,14 +23,9 @@
>  
>  
>      <target name="libs-for-clmp" depends="init-libs">
> -        <artifact:dependencies>
> -               <dependency groupId="commons-digester"    artifactId="commons-digester"  
> version="1.7"/>
> -               <dependency groupId="net.sf.saxon" artifactId="saxon"       
> version="8.7"/>
> -               <dependency groupId="net.sf.saxon" artifactId="saxon-jdom"  
> version="8.7"/>
> -               <dependency groupId="net.sf.saxon" artifactId="saxon-dom"   
> version="8.7"/>
> -               
> -                <localRepository refid="local.repository"/>
> -               <remoteRepository refid="remote.repository"/>
> +           <artifact:dependencies>
> +            <localRepository refid="local.repository"/>
> +                   <remoteRepository refid="remote.repository"/>
>                 </artifact:dependencies>
>      </target>
>  
>
> Modified: 
> branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-pre-install-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-pre-install-targets.xml     
>   2007-01-15 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-pre-install-targets.xml     
>   2007-01-16 13:32:40 UTC (rev 1914)
> @@ -14,19 +14,23 @@
>  
>  
>  <project name="clmp-pre-install-targets">
> +    <property name="service.name" value="perfSONAR-CLMP-1.0" />
>  
> -
>      <!-- the main target -->
>  
>  
>      <target name="pre-install">
> -
> -        <echo>Preparing the installation of ${service.name}...</echo>
> -
> +        <echo>Preparing the installation of CLMP...</echo>
> +        <echo />
> +        <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and start 
> again.</echo>
> +        <echo />
> +                        
> +        <antcall target="get-service-name"/>
>          <antcall target="get-service-home"/>
> -
>          <antcall target="webservice-container-download"/>
> -
> +        <antcall target="get-server-address"/>
> +        <antcall target="get-server-port"/>
> +        
>      </target>
>  
>  
>
> Modified: branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml       
> 2007-01-15 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml       
> 2007-01-16 13:32:40 UTC (rev 1914)
> @@ -53,7 +53,7 @@
>              <dependency groupId="commons-pool"          artifactId="commons-pool"         
>   version="1.1"/>
>              <dependency groupId="commons-collections"   artifactId="commons-collections"  
>   version="3.2"/>
>              <dependency groupId="commons-beanutils"     artifactId="commons-beanutils"    
>   version="1.7.0"/>
> -            <dependency groupId="exist"                 artifactId="exist-xmldb"          
>   version="1.0rc"/>
> +                   <dependency groupId="commons-digester"      
> artifactId="commons-digester"       version="1.7"/>
>  
>              <dependency groupId="javax.activation"      artifactId="activation"             version="1.0.2"/>
>              <dependency groupId="javax.mail"            artifactId="mail"                 
>   version="1.3.2"/>
> @@ -61,7 +61,7 @@
>              <dependency groupId="tomcat"                artifactId="servlet-api"          
>   version="5.0.28"/>
>  
>              <dependency groupId="log4j"                 artifactId="log4j"                  version="1.2.9"/>
> -
> +            <dependency groupId="exist"                 artifactId="exist-xmldb"          
>   version="1.0rc"/>
>              <localRepository refid="local.repository"/>
>              <remoteRepository refid="remote.repository"/>
>  
>
> Modified: branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml
> ===================================================================
> --- branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml 2007-01-15 
> 16:52:55 UTC (rev 1913)
> +++ branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml 2007-01-16 
> 13:32:40 UTC (rev 1914)
> @@ -172,7 +172,9 @@
>          depends="webservice-container-question"
>          if="tomcat.install.decision">
>  
> -        <dirname property="_tomcat.install.location" file="${basedir}"/>
> +        <!-- <dirname property="_tomcat.install.location" file="${basedir}"/> 
> -->
> +        <property file="ant/const.properties" />
> +        <dirname property="_tomcat.install.location" file="${service.home}"/>
>  
>          <input message="Enter the path for the Tomcat installation: [${_tomcat.install.location}/${tomcat.dir}]:"
>              addproperty="tomcat.install.location"
>
>   


--

//  PSNC, Poland
//  phone: (+48 61) 858 20 24
//  http://www.man.poznan.pl