[seam-commits] Seam SVN: r7988 - in branches/Seam_2_0/seam-gen: build-scripts and 1 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Sun Apr 20 22:12:29 EDT 2008


Author: dan.j.allen
Date: 2008-04-20 22:12:29 -0400 (Sun, 20 Apr 2008)
New Revision: 7988

Added:
   branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear-war.list
   branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear.list
   branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list
   branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear.list
Modified:
   branches/Seam_2_0/seam-gen/build-scripts/build.xml
   branches/Seam_2_0/seam-gen/build.xml
   branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml
Log:
JBSEAM-2897 for EAR support


Modified: branches/Seam_2_0/seam-gen/build-scripts/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build-scripts/build.xml	2008-04-21 02:10:12 UTC (rev 7987)
+++ branches/Seam_2_0/seam-gen/build-scripts/build.xml	2008-04-21 02:12:29 UTC (rev 7988)
@@ -121,13 +121,7 @@
                 </copy>         
                 <copy todir="${war.dir}/WEB-INF/lib">
                         <fileset dir="${lib.dir}">
-                                <include name="richfaces-impl*.jar" />
-                        		<include name="richfaces-ui*.jar" />
-                                <include name="oscache*.jar" />
-                                <include name="commons-digester.jar" />
-                                <include name="commons-beanutils.jar" />
-                                <include name="jsf-facelets.jar" />
-                                <include name="jboss-seam-*.jar" />
+                                <includesfile name="deployed-jars-war.list" />
                                 <exclude name="jboss-seam-gen.jar" />
                         </fileset>
                 </copy>
@@ -151,14 +145,7 @@
                  </copy>
                  <copy todir="${ear.dir}/lib">
                         <fileset dir="${lib.dir}">
-                                <include name="jbpm*.jar" />
-                                <include name="jboss-el.jar" />
-                                <include name="drools-*.jar"/>
-                                <include name="core.jar"/>
-                                <include name="janino*.jar"/>
-                                <include name="antlr-*.jar"/>
-                                <include name="mvel*.jar"/>
-                        		<include name="richfaces-api*.jar" />
+                                <includesfile name="deployed-jars-ear.list" />
                         </fileset>
                 </copy>
                 <copy todir="${ear.dir}/META-INF">

Added: branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear-war.list	                        (rev 0)
+++ branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear-war.list	2008-04-21 02:12:29 UTC (rev 7988)
@@ -0,0 +1,6 @@
+commons-beanutils.jar
+commons-digester.jar
+jboss-seam-*.jar
+jsf-facelets.jar
+richfaces-impl.jar
+richfaces-ui.jar

Added: branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear.list	                        (rev 0)
+++ branches/Seam_2_0/seam-gen/build-scripts/deployed-jars-ear.list	2008-04-21 02:12:29 UTC (rev 7988)
@@ -0,0 +1,9 @@
+antlr-runtime.jar
+core.jar
+drools-compiler.jar
+drools-core.jar
+janino.jar
+jboss-el.jar
+jbpm-jpdl.jar
+mvel.jar
+richfaces-api.jar

Modified: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml	2008-04-21 02:10:12 UTC (rev 7987)
+++ branches/Seam_2_0/seam-gen/build.xml	2008-04-21 02:12:29 UTC (rev 7988)
@@ -676,6 +676,10 @@
 	             file="${base.dir}/resources/WEB-INF/components.xml">
 	         <filterset refid="project"/>
 	     </copy>
+        <copy tofile="${project.home}/deployed-jars-ear.list" 
+                file="${base.dir}/build-scripts/deployed-jars-ear.list"/>
+        <copy tofile="${project.home}/deployed-jars-war.list" 
+                file="${base.dir}/build-scripts/deployed-jars-ear-war.list"/>
         <copy tofile="${project.home}/build.xml" 
                 file="${base.dir}/build-scripts/build.xml">
             <filterset refid="project"/>

Modified: branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml	2008-04-21 02:10:12 UTC (rev 7987)
+++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml	2008-04-21 02:12:29 UTC (rev 7988)
@@ -120,9 +120,7 @@
                 </copy>         
           <copy todir="${war.dir}/WEB-INF/lib">
             <fileset dir="${lib.dir}">
-				<include name="oscache*.jar" />
-				<include name="jboss-seam-*.jar" />
-				<include name="commons-beanutils.jar" />
+				<includesfile name="deployed-jars-war.list" />
 				<exclude name="jboss-seam-gen.jar" />
 			</fileset>
 		</copy>
@@ -141,24 +139,16 @@
                                 <include name="jbpm.cfg.xml" />
                                 <include name="*.drl" />
                         </fileset>
-                		<fileset dir="${lib.dir}">
-                				<include name="jboss-seam.jar" />
-                		</fileset>
-                        <fileset dir="${basedir}">
-                                <include name="lib/jbpm*.jar" />
-                                <include name="lib/jboss-el.jar" />
-                                <include name="lib/drools-*.jar"/>
-                                <include name="lib/core.jar"/>
-                                <include name="lib/janino*.jar"/>
-                                <include name="lib/antlr-*.jar"/>
-                                <include name="lib/mvel*.jar"/>
-				                <include name="lib/icefaces*.jar" />
-				                <include name="lib/backport-util-concurrent.jar" />
-				                <include name="lib/commons-fileupload.jar"/> 	
-                                <include name="lib/commons-digester.jar"/>
-                                <exclude name="lib/icefaces-ahs.jar"/>		
+                        <fileset dir="${lib.dir}">
+                                <include name="jboss-seam.jar" />
                         </fileset>
                 </copy>
+                <copy todir="${ear.dir}/lib">
+                        <fileset dir="${lib.dir}">
+                                <includesfile name="deployed-jars-ear.list" />
+                                <exclude name="icefaces-ahs.jar"/>		
+                        </fileset>
+                </copy>
                 <copy todir="${ear.dir}/META-INF">
                         <fileset dir="${basedir}/resources/META-INF">
                                 <include name="application.xml" />

Added: branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list	                        (rev 0)
+++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list	2008-04-21 02:12:29 UTC (rev 7988)
@@ -0,0 +1,2 @@
+commons-beanutils.jar
+jboss-seam-*.jar

Added: branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear.list	                        (rev 0)
+++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/deployed-jars-ear.list	2008-04-21 02:12:29 UTC (rev 7988)
@@ -0,0 +1,14 @@
+antlr-runtime.jar
+backport-util-concurrent.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
+jbpm-jpdl.jar
+mvel.jar




More information about the seam-commits mailing list