[seam-commits] Seam SVN: r10304 - trunk/seam-gen/build-scripts.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sun Apr 5 23:50:29 EDT 2009
Author: dan.j.allen
Date: 2009-04-05 23:50:29 -0400 (Sun, 05 Apr 2009)
New Revision: 10304
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.xml
Log:
condense some filesets when copying
use istrue condition rather than equals
formatting
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2009-04-06 02:40:32 UTC (rev 10303)
+++ trunk/seam-gen/build-scripts/build-war.xml 2009-04-06 03:50:29 UTC (rev 10304)
@@ -66,10 +66,10 @@
<available file="${jboss.home}/lib/jboss-vfs.jar"/> <!-- JBoss AS >= 5.0 -->
</condition>
<condition property="seamEmfRef" value="#{entityManagerFactory}" else="#{null}">
- <equals arg1="${seamBootstrapsPu}" arg2="true"/>
+ <istrue value="${seamBootstrapsPu}"/>
</condition>
<condition property="puJndiName" value="#{null}" else="java:comp/env/${project.name}/pu">
- <equals arg1="${seamBootstrapsPu}" arg2="true"/>
+ <istrue value="${seamBootstrapsPu}"/>
</condition>
<filterset id="persistence">
@@ -194,14 +194,8 @@
<target name="war" depends="compile"
description="Build the WAR structure in a staging directory">
- <copy todir="${war.dir}/WEB-INF/classes">
- <fileset dir="${basedir}/resources">
- <include name="seam.properties" />
- <include name="*.drl" />
- </fileset>
- <fileset dir="${src.model.dir}">
- <include name="**/*.component.xml" />
- </fileset>
+ <copy todir="${war.dir}">
+ <fileset dir="${basedir}/view" />
</copy>
<copy tofile="${war.dir}/WEB-INF/classes/components.properties"
@@ -217,23 +211,10 @@
<copy tofile="${war.dir}/WEB-INF/classes/import.sql"
file="${basedir}/resources/import-${profile}.sql"/>
- <copy todir="${war.dir}">
- <fileset dir="${basedir}/view" />
- </copy>
-
<copy todir="${war.dir}/WEB-INF">
<fileset dir="${basedir}/resources/WEB-INF">
<include name="*.*"/>
- <include name="classes/**/*.*"/>
- <exclude name="classes/**/*.class"/>
- <exclude name="classes/**/*.groovy"/>
- </fileset>
- </copy>
-
- <copy todir="${war.dir}/WEB-INF">
- <fileset dir="${basedir}/resources/WEB-INF">
<include name="lib/*.*"/>
- <include name="classes/**/*.class"/>
</fileset>
</copy>
@@ -247,31 +228,27 @@
</copy>
<copy todir="${war.dir}/WEB-INF/classes">
- <fileset dir="${basedir}/resources">
- <include name="**/*.xcss" if="richfaces.present"/>
+ <fileset dir="${src.model.dir}">
+ <include name="**/*.component.xml" />
</fileset>
- <!-- move XCSS into classpath for now
- loading from web context only works in JBoss AS 4 -->
- <fileset dir="${basedir}/view">
- <include name="**/*.xcss" if="richfaces.present"/>
- </fileset>
- </copy>
-
- <copy todir="${war.dir}/WEB-INF/classes">
<fileset dir="${basedir}/resources">
<include name="messages*.properties"/>
- <include name="*.skin.properties" if="richfaces.present"/>
<include name="*_theme.properties"/>
- </fileset>
- </copy>
-
- <copy todir="${war.dir}/WEB-INF/classes">
- <fileset dir="${basedir}/resources">
+ <include name="seam.properties" />
+ <include name="*.drl" />
+ <include name="META-INF/*.drl" />
<include name="*jpdl.xml" />
<include name="*hibernate.cfg.xml" />
<include name="jbpm.cfg.xml" />
<include name="META-INF/orm.xml" />
+ <include name="*.skin.properties" if="richfaces.present"/>
+ <include name="**/*.xcss" if="richfaces.present"/>
</fileset>
+ <!-- move XCSS into classpath for now
+ loading from web context only works in JBoss AS 4 -->
+ <fileset dir="${basedir}/view">
+ <include name="**/*.xcss" if="richfaces.present"/>
+ </fileset>
</copy>
</target>
@@ -428,7 +405,7 @@
</target>
<target name="test" depends="buildtest" description="Run the tests">
- <condition property="incompatible.jdk">
+ <condition property="incompatible.jdk" value="true">
<and>
<equals arg1="${ant.java.version}" arg2="1.6"/>
<not><available classname="javax.xml.bind.JAXB"/></not>
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2009-04-06 02:40:32 UTC (rev 10303)
+++ trunk/seam-gen/build-scripts/build.xml 2009-04-06 03:50:29 UTC (rev 10304)
@@ -168,13 +168,14 @@
<target name="jar" depends="compile,copyclasses"
description="Build the JAR structure in a staging directory">
<copy todir="${jar.dir}">
+ <fileset dir="${src.model.dir}">
+ <include name="**/*.component.xml" />
+ </fileset>
<fileset dir="${basedir}/resources">
<include name="seam.properties"/>
<include name="*.drl"/>
+ <include name="META-INF/*.drl"/>
</fileset>
- <fileset dir="${src.model.dir}">
- <include name="**/*.component.xml" />
- </fileset>
</copy>
<copy todir="${jar.dir}/META-INF">
<fileset dir="${basedir}/resources/META-INF">
@@ -202,14 +203,7 @@
<copy todir="${war.dir}/WEB-INF">
<fileset dir="${basedir}/resources/WEB-INF">
<include name="*.*"/>
- <include name="classes/**/*.*"/>
- <exclude name="classes/**/*.class"/>
- </fileset>
- </copy>
- <copy todir="${war.dir}/WEB-INF">
- <fileset dir="${basedir}/resources/WEB-INF">
<include name="lib/*.*"/>
- <include name="classes/**/*.class"/>
</fileset>
</copy>
<copy todir="${war.dir}/WEB-INF/lib">
@@ -220,6 +214,9 @@
</copy>
<copy todir="${war.dir}/WEB-INF/classes">
<fileset dir="${basedir}/resources">
+ <include name="messages*.properties"/>
+ <include name="*.skin.properties" if="richfaces.present"/>
+ <include name="*_theme.properties"/>
<include name="**/*.xcss" if="richfaces.present"/>
</fileset>
<!-- move XCSS into classpath for now
@@ -228,13 +225,6 @@
<include name="**/*.xcss" if="richfaces.present"/>
</fileset>
</copy>
- <copy todir="${war.dir}/WEB-INF/classes">
- <fileset dir="${basedir}/resources">
- <include name="messages*.properties"/>
- <include name="*.skin.properties" if="richfaces.present"/>
- <include name="*_theme.properties"/>
- </fileset>
- </copy>
</target>
<target name="ear" description="Build the EAR structure in a staging directory">
@@ -299,17 +289,17 @@
<copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}">
- <include name="**/*"/>
- <exclude name="${project.name}_jar/**"/>
- <exclude name="${project.name}_war/**"/>
- </fileset>
+ <include name="**/*"/>
+ <exclude name="${project.name}_jar/**"/>
+ <exclude name="${project.name}_war/**"/>
+ </fileset>
</copy>
- <copy todir="${jar.deploy.dir}">
- <fileset dir="${jar.dir}"/>
- </copy>
- <copy todir="${war.deploy.dir}">
- <fileset dir="${war.dir}"/>
- </copy>
+ <copy todir="${jar.deploy.dir}">
+ <fileset dir="${jar.dir}"/>
+ </copy>
+ <copy todir="${war.deploy.dir}">
+ <fileset dir="${war.dir}"/>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
@@ -435,7 +425,7 @@
</target>
<target name="test" depends="buildtest" description="Run the tests">
- <condition property="incompatible.jdk">
+ <condition property="incompatible.jdk" value="true">
<and>
<equals arg1="${ant.java.version}" arg2="1.6"/>
<not><available classname="javax.xml.bind.JAXB"/></not>
More information about the seam-commits
mailing list