[Fedora-directory-commits] dsmlgw build.xml,1.4,1.5

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13196/dsmlgw

Modified Files:
    build.xml 
Log Message:
added restart and stop commands - clean up setup, start, and build.xml

Index: build.xml
===================================================================
RCS file: /cvs/dirsec/dsmlgw/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml	23 Apr 2008 16:55:58 -0000	1.4
+++ build.xml	23 Apr 2008 21:38:02 -0000	1.5
@@ -151,9 +151,7 @@
    <target name="pkgwebapp" description="create the webapps layout, prepare for WAR" depends="dist,useaxisbinpkg,copywebappsdir">
    	<!-- install jar files required at runtime -->
    	<copy file="${dist.dir}/dsmlgw.jar" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>
-		<!-- ldapjdk.jar should already be on the system - create symlink during setup
    	<copy file="${ldapjdk.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>
-		-->
    	<copy file="${codec.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>
    	<copy file="${activation.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>
    	<copy file="${mail.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>
@@ -174,47 +172,10 @@
    		</fileset>
    	</war>
    </target>
-	
-	<target name="makepkg" description="create the distribution package" depends="makewar">
-		<mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/>
-		<mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/>
-		<mkdir dir="${pkg.dir}${dsmlgwlogdir}"/>
-		<mkdir dir="${pkg.dir}${dsmlgwrundir}"/>
-		<mkdir dir="${pkg.dir}${dsmlgwsbindir}"/>
-		<unjar src="${dist.dir}/dsmlgw.war" dest="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/>
-		<copy file="misc/setup-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw">
-			<filterchain>
-				<replacetokens>
-			    	<token key="package_name"      value="${ant.project.name}"/>
-			    	<token key="runtime_javahome"  value="${runtime.java.home}"/>
-			    	<token key="tomcat_home"       value="${tomcat.home}"/>
-			    	<token key="tomcat_cmd"        value="${tomcat.cmd}"/>
-			    	<token key="dsmlgwdatadir"     value="${dsmlgwdatadir}"/>
-			    	<token key="dsmlgwconfigdir"   value="${dsmlgwconfigdir}"/>
-			    	<token key="dsmlgwlogdir"      value="${dsmlgwlogdir}"/>
-			    	<token key="dsmlgwrundir"      value="${dsmlgwrundir}"/>
-			    	<token key="dsmlgwsbindir"     value="${dsmlgwsbindir}"/>
-			    	<token key="dsmlgwuser"        value="${dsmlgwuser}"/>
-			    </replacetokens>
-			</filterchain>		
-		</copy>
-		<copy file="misc/start-ds-dsmlgw.in" tofile="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw">
-			<filterchain>
-				<replacetokens>
-			    	<token key="package_name"      value="${ant.project.name}"/>
-			    	<token key="runtime_javahome"  value="${runtime.java.home}"/>
-			    	<token key="tomcat_home"       value="${tomcat.home}"/>
-			    	<token key="tomcat_cmd"        value="${tomcat.cmd}"/>
-			    	<token key="dsmlgwdatadir"     value="${dsmlgwdatadir}"/>
-			    	<token key="dsmlgwconfigdir"   value="${dsmlgwconfigdir}"/>
-			    	<token key="dsmlgwlogdir"      value="${dsmlgwlogdir}"/>
-			    	<token key="dsmlgwrundir"      value="${dsmlgwrundir}"/>
-			    	<token key="dsmlgwsbindir"     value="${dsmlgwsbindir}"/>
-			    	<token key="dsmlgwuser"        value="${dsmlgwuser}"/>
-			    </replacetokens>
-			</filterchain>		
-		</copy>
-		<copy file="misc/dsmlgw.env.in" tofile="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env">
+
+	<!-- copy a file from file to tofile and replace @token@ with the value -->
+	<presetdef name="copyfilter">
+		<copy file="${src.file}" tofile="${dest.file}">
    		<filterchain>
    			<replacetokens>
    		    	<token key="package_name"      value="${ant.project.name}"/>
@@ -230,7 +191,32 @@
    		    </replacetokens>
    		</filterchain>		
    	</copy>
+	</presetdef>
+	
+	<target name="makepkg" description="create the distribution package" depends="makewar">
+		<mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/>
+		<mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/>
+		<mkdir dir="${pkg.dir}${dsmlgwlogdir}"/>
+		<mkdir dir="${pkg.dir}${dsmlgwrundir}"/>
+		<mkdir dir="${pkg.dir}${dsmlgwsbindir}"/>
+		<unjar src="${dist.dir}/dsmlgw.war" dest="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/>
+		<copyfilter file="misc/setup-ds-dsmlgw.in"
+			tofile="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw"/>
+		<chmod file="${pkg.dir}${dsmlgwsbindir}/setup-ds-dsmlgw" perm="0755"/>
+		<copyfilter file="misc/start-ds-dsmlgw.in"
+			tofile="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw"/>
+		<chmod file="${pkg.dir}${dsmlgwsbindir}/start-ds-dsmlgw" perm="0755"/>
+		<copyfilter file="misc/stop-ds-dsmlgw.in"
+			tofile="${pkg.dir}${dsmlgwsbindir}/stop-ds-dsmlgw"/>
+		<chmod file="${pkg.dir}${dsmlgwsbindir}/stop-ds-dsmlgw" perm="0755"/>
+		<copyfilter file="misc/restart-ds-dsmlgw.in"
+			tofile="${pkg.dir}${dsmlgwsbindir}/restart-ds-dsmlgw"/>
+		<chmod file="${pkg.dir}${dsmlgwsbindir}/restart-ds-dsmlgw" perm="0755"/>
+		<copyfilter file="misc/dsmlgw.env.in"
+			tofile="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env"/>
+		<chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.env" perm="0644"/>
    	<copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/>
+		<chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/>
    	<tar destfile="${dist.dir}/${ant.project.name}-${version}.tar"
    		basedir="${pkg.dir}"/>
    	<gzip zipfile="${dist.dir}/${ant.project.name}-${version}.tar.gz"