openamf/build build.xml,1.54,1.55

[email protected] Wed, 08 Oct 2003 09:03:58 -0700
Newsgroups gmane.comp.java.openamf.cvs
Message-ID <[email protected]>
Update of /cvsroot/openamf/openamf/build
In directory sc8-pr-cvs1:/tmp/cvs-serv20500/build

Modified Files:
	build.xml 
Log Message:
1) removed some dependencies with hard coded output file names
2) fixed usage text

Index: build.xml
===================================================================
RCS file: /cvsroot/openamf/openamf/build/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** build.xml	21 Aug 2003 00:08:33 -0000	1.54
--- build.xml	8 Oct 2003 16:03:56 -0000	1.55
***************
*** 60,67 ****
  	<property name="web.build.lib.dir" value="${web.build.inf.dir}/lib"/>
  	<property name="web.build.classes.dir" value="${web.build.inf.dir}/classes"/>
! 	<property name="jar.file" value="${build.dir}/${name}.jar"/>
! 	<property name="war.file" value="${build.dir}/${name}.war"/>
! 	<property name="ejb.jar.file" value="${build.dir}/${name}-ejb.jar"/>
! 	<property name="ear.file" value="${build.dir}/${name}.ear"/>
  	<property name="dist.zip.file" value="${build.dir}/${name}.zip"/>
  	<property name="examples.zip.file" value="${build.dir}/${name}-examples.zip"/>
--- 60,71 ----
  	<property name="web.build.lib.dir" value="${web.build.inf.dir}/lib"/>
  	<property name="web.build.classes.dir" value="${web.build.inf.dir}/classes"/>
! 	<property name="jar.filename" value="${name}.jar"/>
! 	<property name="war.filename" value="${name}.war"/>
! 	<property name="ejb.jar.filename" value="${name}-ejb.jar"/>
! 	<property name="ear.filename" value="${name}.ear"/>
! 	<property name="jar.file" value="${build.dir}/${jar.filename}"/>
! 	<property name="war.file" value="${build.dir}/${war.filename}"/>
! 	<property name="ejb.jar.file" value="${build.dir}/${ejb.jar.filename}"/>
! 	<property name="ear.file" value="${build.dir}/${ear.filename}"/>
  	<property name="dist.zip.file" value="${build.dir}/${name}.zip"/>
  	<property name="examples.zip.file" value="${build.dir}/${name}-examples.zip"/>
***************
*** 98,102 ****
  			  deploy-ear  - builds ear and copies to
  			                ${deploy.dir}
! 			  javadoc     - builds API documentation in ${javadocs.build.dir}
  			  dist        - builds ${dist.zip.file}
  			                and ${examples.zip.file}
--- 102,106 ----
  			  deploy-ear  - builds ear and copies to
  			                ${deploy.dir}
! 			  javadocs    - builds API documentation in ${javadocs.build.dir}
  			  dist        - builds ${dist.zip.file}
  			                and ${examples.zip.file}
***************
*** 248,252 ****
  	<target name="ear" depends="war,ejb-jar">
  		<ear destfile="${ear.file}" appxml="${application.xml.file}">
! 			<fileset dir="${build.dir}" includes="openamf-ejb.jar,openamf.war"/>
  			<fileset dir="${basedir}" includes="${logging.jar.file}"/>
  		</ear>
--- 252,256 ----
  	<target name="ear" depends="war,ejb-jar">
  		<ear destfile="${ear.file}" appxml="${application.xml.file}">
! 			<fileset dir="${build.dir}" includes="${ejb.jar.filename},${war.filename}"/>
  			<fileset dir="${basedir}" includes="${logging.jar.file}"/>
  		</ear>
***************
*** 255,259 ****
  	<target name="deploy-ear" depends="ear">
  		<!--Delete war file from deploy dir if it exists before deploying ear-->
! 		<delete file="${deploy.dir}/openamf.war"/>
  		<copy file="${ear.file}" todir="${deploy.dir}"/>
  	</target>
--- 259,263 ----
  	<target name="deploy-ear" depends="ear">
  		<!--Delete war file from deploy dir if it exists before deploying ear-->
! 		<delete file="${deploy.dir}/${war.filename}"/>
  		<copy file="${ear.file}" todir="${deploy.dir}"/>
  	</target>
***************
*** 261,265 ****
  	<target name="deploy-war" depends="war">
  		<!--Delete ear file from deploy dir if it exists before deploying war-->
! 		<delete file="${deploy.dir}/openamf.ear"/>
  		<copy file="${war.file}" todir="${deploy.dir}"/>
  	</target>
--- 265,269 ----
  	<target name="deploy-war" depends="war">
  		<!--Delete ear file from deploy dir if it exists before deploying war-->
! 		<delete file="${deploy.dir}/${ear.filename}"/>
  		<copy file="${war.file}" todir="${deploy.dir}"/>
  	</target>
***************
*** 298,302 ****
  			<fileset dir="${docs.dir}" includes="README.txt"/>
  			<fileset refid="javadocs"/>
! 			<fileset dir="${build.dir}" includes="openamf.jar"/>
  			<fileset refid="source"/>
  			<fileset refid="distjars"/>
--- 302,306 ----
  			<fileset dir="${docs.dir}" includes="README.txt"/>
  			<fileset refid="javadocs"/>
! 			<fileset dir="${build.dir}" includes="${jar.filename}"/>
  			<fileset refid="source"/>
  			<fileset refid="distjars"/>
***************
*** 305,309 ****
  			<fileset dir="${docs.dir}" includes="README.txt"/>
  			<fileset refid="javadocs"/>
! 			<fileset dir="${build.dir}" includes="openamf.war, openamf.jar, openamf.ear"/>
  			<fileset refid="source"/>
  			<fileset refid="distjars"/>
--- 309,313 ----
  			<fileset dir="${docs.dir}" includes="README.txt"/>
  			<fileset refid="javadocs"/>
! 			<fileset dir="${build.dir}" includes="${war.filename}, ${jar.filename}, ${ear.filename}"/>
  			<fileset refid="source"/>
  			<fileset refid="distjars"/>




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php