[jboss-cvs] jboss-seam/seam-gen/build-scripts ...
Gavin King
gavin.king at jboss.com
Wed Mar 7 11:49:06 EST 2007
User: gavin
Date: 07/03/07 11:49:06
Modified: seam-gen/build-scripts .classpath build-war.xml build.xml
Log:
test dirs
Revision Changes Path
1.12 +1 -1 jboss-seam/seam-gen/build-scripts/.classpath
(In the diff below, changes in quantity of whitespace are not shown.)
Index: .classpath
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/.classpath,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- .classpath 7 Mar 2007 05:22:48 -0000 1.11
+++ .classpath 7 Mar 2007 16:49:05 -0000 1.12
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/model" output="classes/model"/>
<classpathentry kind="src" path="src/action" output="classes/action"/>
- <classpathentry kind="src" path="test"/>
+ <classpathentry kind="src" path="src/test" output="classes/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="embedded-ejb/conf"/>
<classpathentry kind="lib" path="lib/hibernate-all.jar"/>
1.7 +28 -8 jboss-seam/seam-gen/build-scripts/build-war.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-war.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/build-war.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- build-war.xml 7 Mar 2007 05:22:48 -0000 1.6
+++ build-war.xml 7 Mar 2007 16:49:05 -0000 1.7
@@ -10,11 +10,12 @@
<property name="dist.dir" value="dist" />
<property name="src.model.dir" value="src/model" />
<property name="src.action.dir" value="src/action" />
- <property name="src.test.dir" value="test" />
+ <property name="src.test.dir" value="src/test" />
<property name="lib.dir" value="lib" />
<property name="war.dir" value="exploded-archives/${project.name}.war" />
- <property name="classes.dir" value="${war.dir}/WEB-INF/classes" />
- <property name="test.dir" value="classes/test" />
+ <property name="classes.model.dir" value="${war.dir}/WEB-INF/classes" />
+ <property name="classes.action.dir" value="${war.dir}/WEB-INF/dev" />
+ <property name="test.dir" value="test-build" />
<property name="embedded-ejb3.dir" value="${basedir}/embedded-ejb/conf" />
<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
<property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" />
@@ -41,7 +42,7 @@
description="Compile the Java source code"
unless="eclipse.running">
<javac classpathref="build.classpath"
- destdir="${war.dir}/WEB-INF/classes"
+ destdir="${classes.model.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
nowarn="on">
@@ -57,7 +58,7 @@
debug="${javac.debug}"
deprecation="${javac.deprecation}"
nowarn="on">
- <classpath path="${war.dir}/WEB-INF/classes"/>
+ <classpath path="${classes.action.dir}"/>
<src path="${src.action.dir}" />
</javac>
</target>
@@ -65,12 +66,12 @@
<target name="copyclasses" depends="init"
description="Copy the classes that were compiled by eclipse"
if="eclipse.running">
- <copy todir="${war.dir}/WEB-INF/classes">
+ <copy todir="${classes.model.dir}">
<fileset dir="classes/model">
<include name="**/*.class"/>
</fileset>
</copy>
- <copy todir="${war.dir}/WEB-INF/dev">
+ <copy todir="${classes.action.dir}">
<fileset dir="classes/action">
<include name="**/*.class"/>
</fileset>
@@ -231,7 +232,26 @@
</javac>
</target>
- <target name="buildtest" depends="compiletest" description="Build the tests">
+ <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir">
+ <mkdir dir="${test.dir}"/>
+ <copy todir="${test.dir}">
+ <fileset dir="classes/model">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+ <copy todir="${test.dir}">
+ <fileset dir="classes/action">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+ <copy todir="${test.dir}">
+ <fileset dir="classes/test">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="buildtest" depends="compiletest,copytestclasses" description="Build the tests">
<copy todir="${test.dir}">
<fileset dir="${basedir}/resources">
<exclude name="META-INF/persistence*.xml"/>
1.26 +23 -4 jboss-seam/seam-gen/build-scripts/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- build.xml 7 Mar 2007 05:22:48 -0000 1.25
+++ build.xml 7 Mar 2007 16:49:05 -0000 1.26
@@ -8,14 +8,14 @@
<!-- set global properties for this build -->
<property name="project.name" value="@projectName@"/>
<property name="dist.dir" value="dist" />
- <property name="src.action.dir" value="src/action" />
<property name="src.model.dir" value="src/model" />
- <property name="src.test.dir" value="test" />
+ <property name="src.action.dir" value="src/action" />
+ <property name="src.test.dir" value="src/test" />
<property name="lib.dir" value="lib" />
<property name="ear.dir" value="exploded-archives/${project.name}.ear" />
<property name="jar.dir" value="exploded-archives/${project.name}.jar" />
<property name="war.dir" value="exploded-archives/${project.name}.war" />
- <property name="test.dir" value="classes/test" />
+ <property name="test.dir" value="test-build" />
<property name="embedded-ejb3.dir" value="${basedir}/embedded-ejb/conf" />
<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" />
@@ -244,7 +244,26 @@
</javac>
</target>
- <target name="buildtest" depends="compiletest" description="Build the tests">
+ <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir">
+ <mkdir dir="${test.dir}"/>
+ <copy todir="${test.dir}">
+ <fileset dir="classes/model">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+ <copy todir="${test.dir}">
+ <fileset dir="classes/action">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+ <copy todir="${test.dir}">
+ <fileset dir="classes/test">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="buildtest" depends="compiletest,copytestclasses" description="Build the tests">
<copy todir="${test.dir}">
<fileset dir="${basedir}/resources">
<exclude name="META-INF/persistence*.xml"/>
More information about the jboss-cvs-commits
mailing list