Author: dan.j.allen Date: 2008-04-14 21:09:35 -0400 (Mon, 14 Apr 2008) New Revision: 7950 Added: branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list Modified: branches/Seam_2_0/seam-gen/build-scripts/build-war.xml branches/Seam_2_0/seam-gen/build.xml branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml Log: JBSEAM-2897 - first cut at externalizing JAR includes that are packaged with deployable archive Modified: branches/Seam_2_0/seam-gen/build-scripts/build-war.xml =================================================================== --- branches/Seam_2_0/seam-gen/build-scripts/build-war.xml 2008-04-15 01:09:20 UTC (rev 7949) +++ branches/Seam_2_0/seam-gen/build-scripts/build-war.xml 2008-04-15 01:09:35 UTC (rev 7950) @@ -179,16 +179,8 @@ <copy todir="${war.dir}/WEB-INF/lib"> <fileset dir="${lib.dir}"> - <include name="richfaces*.jar" /> - <include name="oscache*.jar" /> - <include name="jsf-facelets.jar" /> - <include name="jboss-seam-*.jar" /> - <exclude name="jboss-seam-gen.jar" /> - <include name="drools-*.jar"/> - <include name="core.jar"/> - <include name="janino*.jar"/> - <include name="antlr-*.jar"/> - <include name="mvel*.jar"/> + <includesfile name="deployed-jars.list"/> + <exclude name="jboss-seam-gen.jar"/> <include name="groovy-*.jar" if="groovy.present"/> </fileset> </copy> @@ -207,16 +199,6 @@ </fileset> </copy> - <copy todir="${war.dir}/WEB-INF/lib"> - <fileset dir="${lib.dir}"> - <include name="jboss-seam.jar" /> - <include name="jbpm*.jar" /> - <include name="jboss-el.jar" /> - <include name="commons-digester.jar" /> - <include name="commons-beanutils.jar" /> - </fileset> - </copy> - </target> <target name="archive" depends="war" Added: branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list =================================================================== --- branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list (rev 0) +++ branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-war.list 2008-04-15 01:09:35 UTC (rev 7950) @@ -0,0 +1,16 @@ +antlr-runtime.jar +commons-beanutils.jar +commons-digester.jar +core.jar +drools-compiler.jar +drools-core.jar +janino.jar +jboss-el.jar +jboss-seam.jar +jboss-seam-*.jar +jbpm-jpdl.jar +jsf-facelets.jar +mvel.jar +richfaces-api.jar +richfaces-impl.jar +richfaces-ui.jar Modified: branches/Seam_2_0/seam-gen/build.xml =================================================================== --- branches/Seam_2_0/seam-gen/build.xml 2008-04-15 01:09:20 UTC (rev 7949) +++ branches/Seam_2_0/seam-gen/build.xml 2008-04-15 01:09:35 UTC (rev 7950) @@ -651,6 +651,8 @@ file="${base.dir}/resources/WEB-INF/components-war.xml"> <filterset refid="project"/> </copy> + <copy tofile="${project.home}/deployed-jars.list" + file="${base.dir}/build-scripts/deployed-jars-war.list"/> <copy tofile="${project.home}/build.xml" file="${base.dir}/build-scripts/build-war.xml"> <filterset refid="project"/> @@ -696,6 +698,9 @@ <target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters"> + <copy tofile="${project.home}/seam-gen.properties" + file="./build.properties"/> + <copy todir="${project.home}/resources"> <fileset dir="${base.dir}/resources/"> <exclude name="datasource-ds.xml"/> @@ -801,6 +806,7 @@ <copy todir="${project.home}"> <fileset dir="${base.dir}/build-scripts"> <exclude name="build*.xml"/> + <exclude name="*.list"/> <exclude name="debug-jboss.launch"/> </fileset> <filterset refid="project"/> Modified: branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2008-04-15 01:09:20 UTC (rev 7949) +++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2008-04-15 01:09:35 UTC (rev 7950) @@ -179,14 +179,9 @@ <copy todir="${war.dir}/WEB-INF/lib"> <fileset dir="${lib.dir}"> - <include name="oscache*.jar" /> - <include name="jboss-seam-*.jar" /> + <includesfile name="deployed-jars.list"/> <exclude name="jboss-seam-gen.jar" /> - <include name="drools-*.jar"/> - <include name="core.jar"/> - <include name="janino*.jar"/> - <include name="antlr-*.jar"/> - <include name="mvel*.jar"/> + <exclude name="icefaces-ahs.jar"/> <include name="groovy-*.jar" if="groovy.present"/> </fileset> </copy> @@ -205,20 +200,6 @@ </fileset> </copy> - <copy todir="${war.dir}/WEB-INF/lib"> - <fileset dir="${lib.dir}"> - <include name="jboss-seam.jar" /> - <include name="jbpm*.jar" /> - <include name="jboss-el.jar" /> - <include name="commons-digester.jar" /> - <include name="commons-beanutils.jar" /> - <include name="icefaces*.jar" /> - <include name="backport-util-concurrent.jar" /> - <include name="commons-fileupload.jar"/> - <exclude name="icefaces-ahs.jar"/> - </fileset> - </copy> - </target> <target name="archive" depends="war" Added: branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list (rev 0) +++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2008-04-15 01:09:35 UTC (rev 7950) @@ -0,0 +1,17 @@ +antlr-runtime.jar +backport-util-concurrent.jar +commons-beanutils.jar +commons-digester.jar +commons-fileupload.jar +core.jar +drools-compiler.jar +drools-core.jar +icefaces.jar +icefaces-comps.jar +icefaces-facelets.jar +janino.jar +jboss-el.jar +jboss-seam.jar +jboss-seam-*.jar +jbpm-jpdl.jar +mvel.jar