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

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	build.xml 
Log Message:
added server-config.wsdd.in


Index: build.xml
===================================================================
RCS file: /cvs/dirsec/dsmlgw/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml	23 Apr 2008 21:38:02 -0000	1.5
+++ build.xml	24 Apr 2008 14:54:25 -0000	1.6
@@ -86,6 +86,26 @@
 	<available file="${axisdist.dir}" type="dir"
 		property="havelocalaxisbin"/>
 
+	<!-- 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}"/>
+			    	<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>
+	</presetdef>
+	
 	<target name="help" description="get help">
 		<echo>
 There are 6 jar files required to build ${ant.project.name}, specified
@@ -157,7 +177,8 @@
 		<copy file="${mail.jar}" todir="${dist.dir}/webapps/axis/WEB-INF/lib"/>
 		<!-- install config files and etc. -->
 		<copy file="misc/dsmlgw.cfg" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/>
-		<copy file="misc/dsmlgw-deploy.wsdd" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/>
+		<copyfilter file="misc/server-config.wsdd.in"
+			tofile="${dist.dir}/webapps/axis/WEB-INF/server-config.wsdd"/>
 		<copy file="misc/logging.properties" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/>
 		<copy file="misc/log4j.properties" todir="${dist.dir}/webapps/axis/WEB-INF/classes"/>
 	</target>
@@ -173,26 +194,6 @@
 		</war>
 	</target>
 
-	<!-- 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}"/>
-			    	<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>
-	</presetdef>
-	
 	<target name="makepkg" description="create the distribution package" depends="makewar">
 		<mkdir dir="${pkg.dir}${dsmlgwdatadir}/webapps/axis"/>
 		<mkdir dir="${pkg.dir}${dsmlgwconfigdir}"/>