[jboss-cvs] jboss-seam/seam-gen/build-scripts ...
Gavin King
gavin.king at jboss.com
Sun Jan 28 22:42:45 EST 2007
User: gavin
Date: 07/01/28 22:42:45
Modified: seam-gen/build-scripts .classpath .exploded.launch
build.xml
Log:
reworked the fix
Revision Changes Path
1.9 +1 -2 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- .classpath 26 Jan 2007 21:15:17 -0000 1.8
+++ .classpath 29 Jan 2007 03:42:45 -0000 1.9
@@ -4,7 +4,6 @@
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="embedded-ejb/conf"/>
- <classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
@@ -30,5 +29,5 @@
<classpathentry kind="lib" path="lib/el-api.jar"/>
<classpathentry kind="lib" path="lib/el-ri.jar"/>
<classpathentry kind="lib" path="lib/@driverJar@"/>
- <classpathentry kind="output" path="exploded-archives/@projectName at .jar"/>
+ <classpathentry kind="output" path="test-build"/>
</classpath>
1.4 +3 -4 jboss-seam/seam-gen/build-scripts/.exploded.launch
(In the diff below, changes in quantity of whitespace are not shown.)
Index: .exploded.launch
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/.exploded.launch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- .exploded.launch 29 Jan 2007 02:22:10 -0000 1.3
+++ .exploded.launch 29 Jan 2007 03:42:45 -0000 1.4
@@ -3,7 +3,7 @@
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
- <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="clean,unexplode,restart,"/>
+ <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="clean,unexplode,restart,buildtest,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -12,9 +12,8 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
- <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="clean,unexplode,restart,"/>
- <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="explode,"/>
- <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dprofile=test"/>
+ <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="clean,unexplode,restart,buildtest,"/>
+ <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="explode,buildtest,"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@projectName@"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/@projectName@/build.xml"/>
1.19 +33 -30 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- build.xml 29 Jan 2007 02:22:10 -0000 1.18
+++ build.xml 29 Jan 2007 03:42:45 -0000 1.19
@@ -41,8 +41,7 @@
</target>
<target name="compile" depends="init"
- description="Compile the Java source code"
- unless="eclipse.running">
+ description="Compile the Java source code">
<javac classpathref="build.classpath"
destdir="${jar.dir}"
debug="${javac.debug}"
@@ -175,7 +174,7 @@
<exclude name="**/*.jar"/>
</fileset>
</delete>
- <delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
+ <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/>
<delete dir="${ear.deploy.dir}" failonerror="no"/>
</target>
@@ -195,21 +194,20 @@
</target>
<target name="clean" description="Cleans up the build directory">
- <delete dir="${dist.dir}" />
- <delete dir="${test.dir}" />
- <delete dir="${ear.dir}" />
- <delete dir="${war.dir}" />
+ <delete dir="${dist.dir}"/>
+ <delete dir="${ear.dir}"/>
+ <delete dir="${war.dir}"/>
+ <delete dir="${jar.dir}"/>
<delete dir="${basedir}/test-report"/>
<delete dir="${basedir}/test-output"/>
- <delete>
- <fileset dir="${jar.dir}">
+ <delete failonerror="no">
+ <fileset dir="${test.dir}">
<exclude name="**/*.class" if="eclipse.running"/>
</fileset>
</delete>
</target>
- <target name="test" depends="jar,war,ear" description="Run the tests">
-
+ <target name="compiletest" unless="eclipse.running">
<mkdir dir="${test.dir}"/>
<javac classpathref="build.classpath"
destdir="${test.dir}"
@@ -219,10 +217,14 @@
<src path="${src.java.dir}" />
<src path="${src.test.dir}" />
</javac>
+ </target>
+
+ <target name="buildtest" depends="compiletest" description="Build the tests">
<copy todir="${test.dir}">
<fileset dir="${basedir}/resources">
- <exclude name="persistence*.xml"/>
+ <exclude name="META-INF/persistence*.xml"/>
<exclude name="import*.sql"/>
+ <exclude name="${project.name}-*-ds.xml"/>
</fileset>
</copy>
<copy tofile="${test.dir}/META-INF/persistence.xml"
@@ -236,7 +238,9 @@
<include name="**/*Test.xml" />
</fileset>
</copy>
+ </target>
+ <target name="test" depends="buildtest" description="Run the tests">
<taskdef resource="testngtasks" classpath="${testng.jar}" />
<testng outputdir="${basedir}/test-report">
<classpath path="${test.dir}" />
@@ -244,7 +248,6 @@
<classpath refid="build.classpath" />
<xmlfileset dir="${test.dir}" includes="*Test.xml" />
</testng>
-
</target>
</project>
More information about the jboss-cvs-commits
mailing list