[Openamf-cvs] openamf/build build.xml,1.52,1.53

[<jca...@us...>]

Update of /cvsroot/openamf/openamf/build
In directory sc8-pr-cvs1:/tmp/cvs-serv4715/build

Modified Files:
	build.xml 
Log Message:
clean up

Index: build.xml
===================================================================
RCS file: /cvsroot/openamf/openamf/build/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** build.xml	20 Aug 2003 20:23:53 -0000	1.52
--- build.xml	20 Aug 2003 22:35:03 -0000	1.53
***************
*** 14,17 ****
--- 14,19 ----
  	<property file="${user.home}/ant.properties"/>
  	<property file="build/ant.properties"/>
+ 	
+ 	
  	<property name="name" value="openamf"/>
  	<property name="src.dir" value="src"/>
***************
*** 67,108 ****
  	<property name="deploy.dir" value="${JBOSS_HOME}/deploy"/>
  
!   <fileset id="test.jars" dir="lib">
! 	  <include name="junit-3.8.1.jar"/>
! 	  <include name="aspectjrt-1.0.5.jar"/>
! 	  <include name="cactus-1.4.1.jar"/>
! 	  <include name="cactus-ant-1.4.1.jar"/>
! 	  <include name="httpunit-1.4.1.jar"/>
!   </fileset>
  
  	<path id="project.class.path">
! 	  <pathelement path="${build.dir}/core"/>
! 	  <pathelement path="${props.dir}"/>
  		<fileset dir="lib">
  			<include name="**/*.jar"/>
  		</fileset>
!     <pathelement location="${java.home}/jre/lib/rt.jar"/>
!     <pathelement location="${java.home}/lib/tools.jar"/>
  	</path>
  
  	<target name="usage">
!     <echo>
! $ ant [target]
! Where [target] is one of:
!   jar         - builds ${jar.file}
!   war         - builds ${war.file}
!   ear         - builds ${ear.file}
!   deploy-war  - builds war and copies to
!                 ${deploy.dir}
!   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}
!   test        - runs test suite
!                 use -Dtest=path/to/package/or/java/file to run
!                 tests in a single package or a single test file
!   clean       - deletes all compiled files,
!                 generated docs and packaged distributables
!     </echo>
  	</target>
  
--- 69,110 ----
  	<property name="deploy.dir" value="${JBOSS_HOME}/deploy"/>
  
! 	<fileset id="test.jars" dir="lib">
! 		<include name="junit-3.8.1.jar"/>
! 		<include name="aspectjrt-1.0.5.jar"/>
! 		<include name="cactus-1.4.1.jar"/>
! 		<include name="cactus-ant-1.4.1.jar"/>
! 		<include name="httpunit-1.4.1.jar"/>
! 	</fileset>
  
  	<path id="project.class.path">
! 		<pathelement path="${build.dir}/core"/>
! 		<pathelement path="${props.dir}"/>
  		<fileset dir="lib">
  			<include name="**/*.jar"/>
  		</fileset>
! 		<pathelement location="${java.home}/jre/lib/rt.jar"/>
!     	<pathelement location="${java.home}/lib/tools.jar"/>
  	</path>
  
  	<target name="usage">
! 	    <echo>
! 			$ ant [target]
! 			Where [target] is one of:
! 			  jar         - builds ${jar.file}
! 			  war         - builds ${war.file}
! 			  ear         - builds ${ear.file}
! 			  deploy-war  - builds war and copies to
! 			                ${deploy.dir}
! 			  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}
! 			  test        - runs test suite
! 			                use -Dtest=path/to/package/or/java/file to run
! 			                tests in a single package or a single test file
! 			  clean       - deletes all compiled files,
! 			                generated docs and packaged distributables
! 	    </echo>
  	</target>
  
***************
*** 135,140 ****
  
  	<target name="ejbdoclet" depends="prepare">
! 		<taskdef name="ejbdoclet" classname="xdoclet.ejb.EjbDocletTask" classpath="${xdoclet.jar.file};${log4j.jar.file};${ant.jar.file}"/>
! 		<ejbdoclet sourcepath="${java.src.dir}" destdir="${generated.java.dir}" classpathref="project.class.path" excludedtags="@version,@author" ejbspec="2.0" force="${xdoclet.force}">
  			<fileset dir="${java.src.dir}">
  				<include name="org/openamf/examples/ejb/*.java"/>
--- 137,153 ----
  
  	<target name="ejbdoclet" depends="prepare">
! 		<taskdef 
! 			name="ejbdoclet" 
! 			classname="xdoclet.ejb.EjbDocletTask" 
! 			classpath="${xdoclet.jar.file};${log4j.jar.file};${ant.jar.file}"/>
! 			
! 		<ejbdoclet 
! 			sourcepath="${java.src.dir}" 
! 			destdir="${generated.java.dir}" 
! 			classpathref="project.class.path" 
! 			excludedtags="@version,@author" 
! 			ejbspec="2.0" 
! 			force="${xdoclet.force}">
! 			
  			<fileset dir="${java.src.dir}">
  				<include name="org/openamf/examples/ejb/*.java"/>
***************
*** 148,152 ****
  			<!--session/-->
  			<deploymentdescriptor destdir="${ejb.build.dd.dir}" validatexml="true"/>
! 			<jboss version="3.0" xmlencoding="UTF-8" destdir="${ejb.build.dd.dir}" validatexml="false" typemapping="Hypersonic SQL"/>
  		</ejbdoclet>
  	</target>
--- 161,170 ----
  			<!--session/-->
  			<deploymentdescriptor destdir="${ejb.build.dd.dir}" validatexml="true"/>
! 			<jboss 
! 				version="3.0" 
! 				xmlencoding="UTF-8" 
! 				destdir="${ejb.build.dd.dir}" 
! 				validatexml="false" 
! 				typemapping="Hypersonic SQL"/>
  		</ejbdoclet>
  	</target>
***************
*** 334,338 ****
          <fileset dir="${java.src.dir}">
            <include name="${test_include}" />
-           <exclude name="org/openamf/examples/RecordSetTest.java" />
          </fileset>
        </batchtest>
--- 352,355 ----