perfsonar development work

[Roman Lapacz <>]

BTW. If you have some specific things in your Ant scripts you don't have 
to keep them only in your branch. You can move to your service Ant 
directory (clmp) in the trunk and eventually later after the discussion 
to core Ant scripts. This way you can have your work in the trunk and 
become quite independent.

Roman



Guilherme Fernandes wrote:
> Hi all,
>
> I have changed one question in configure-targets and one in 
> pre-install-targets for a better understanding (this came up due to 
> bug 126). You can see the diff below.
>
> Are we keeping track of the modifications being made to core 
> targets/files in the STABLE branches of the services? Are these 
> changes being merged with the trunk branch? Or they'll only be merged 
> at the end of the release process?
>
> Guilherme
>
>
>  wrote:
>
> > Author: fernandes
> > Date: 2007-01-31 07:46:42 -0500 (Wed, 31 Jan 2007)
> > New Revision: 2009
> >
> > Modified:
> >   branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml
> >   branches/CL-MP-STABLE/perfsonar/ant/const.properties.clmp
> >   branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml
> > Log:
> > Clarifying installation process
> >
> >
> >
> > Modified: branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml
> > ===================================================================
> > --- branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml    
> > 2007-01-31 12:43:08 UTC (rev 2008)
> > +++ branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml    
> > 2007-01-31 12:46:42 UTC (rev 2009)
> > @@ -101,7 +101,7 @@
> >
> >     <target name="register-fuctionality-question">
> >
> > -        <input message="Do you want the service to register in LS? "
> > +        <input message="Do you want the service to register to a 
> > Lookup Service (LS)? "
> >             addproperty="_functionality.register.decision"
> >             validargs="y,n" />
> >
> >
> > Modified: branches/CL-MP-STABLE/perfsonar/ant/const.properties.clmp
> > ===================================================================
> > --- branches/CL-MP-STABLE/perfsonar/ant/const.properties.clmp    
> > 2007-01-31 12:43:08 UTC (rev 2008)
> > +++ branches/CL-MP-STABLE/perfsonar/ant/const.properties.clmp    
> > 2007-01-31 12:46:42 UTC (rev 2009)
> > @@ -1,30 +1,15 @@
> > #
> > # The file containing variables for ant script 'buid.xml'
> > #
> > -# $Id: const.properties.cl 1163 2006-05-10 15:00:44Z fvetter $
> > -#
> > -# Project: perfSONAR
> > -# Author: fvetter
> > -#
> >
> > -
> > -
> > ### the path to Tomcat installation directory
> > -tomcat.home=/home/fvetter/gt-med2/MA/perfSONAR-RRD_MA-bin-snapshot-20060214/jakarta-tomcat-5.0.28 
> >
> > -
> > +tomcat.home=
> > ### the path to Axis deployment
> > -axis.home=/home/fvetter/gt-med2/MA/perfSONAR-RRD_MA-bin-snapshot-20060214/jakarta-tomcat-5.0.28/webapps/axis 
> >
> > -
> > -
> > -
> > +axis.home=
> > ### params for mapi ant targets
> > -jdk_path=/home/fvetter/jdk1.5.0_05
> > -##mapi_path=/opt/mapi
> > -##mapijni_libpath=/opt/mapi/lib/mapi
> > +jdk_path=
> >
> >
> > -
> > -
> > ### Axis params for web service deployment:
> > # name the host to admin
> > target.server=localhost
> > @@ -33,7 +18,6 @@
> > # name of deployed webservice
> > webservice.name=CommandLineService
> >
> > -
> > ### information which are taken to create release file
> > release.basename=perfSONAR
> > release.servicename=CLMP
> > @@ -64,8 +48,3 @@
> > api.title=perfSONAR
> > api.windowtitle=perfSONAR
> > api.bottom=JRA1 GEANT2 Project
> > -
> > -
> > -
> > -
> > -
> >
> > Modified: branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml
> > ===================================================================
> > --- branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml    
> > 2007-01-31 12:43:08 UTC (rev 2008)
> > +++ branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml    
> > 2007-01-31 12:46:42 UTC (rev 2009)
> > @@ -219,7 +219,7 @@
> >
> >     <target name="_get-tomcat-directory_1" 
> > depends="__get-tomcat-directory" if="tomcat.home.present">
> >
> > -        <input message="Enter the path for the Tomcat installation: 
> > [${tomcat.home}]:"
> > +        <input message="Enter the path where Tomcat is, or will be, 
> > installed: [${tomcat.home}]:"
> >             addproperty="tomcat.install.location"
> >             defaultvalue="${tomcat.home}" />
> >
> > @@ -228,7 +228,7 @@
> >
> >     <target name="_get-tomcat-directory_2" 
> > depends="__get-tomcat-directory" unless="tomcat.home.present">
> >
> > -        <input message="Enter the path for the Tomcat installation: 
> > [/usr/local/tomcat]:"
> > +        <input message="Enter the path where Tomcat is, or will be, 
> > installed: [/usr/local/tomcat]:"
> >             addproperty="tomcat.install.location"
> >             defaultvalue="/usr/local/tomcat" />
> >
> > @@ -296,4 +296,4 @@
> >
> >
> >
> > -</project>
> > \ No newline at end of file
> > +</project>
> >
> >  


--

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