Author: manaRH Date: 2008-03-20 18:11:32 -0400 (Thu, 20 Mar 2008) New Revision: 7670 Removed: branches/Seam_1_2_1_AP/examples/booking/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar branches/Seam_1_2_1_AP/examples/booking/resources/WEB-INF/lib/commons-digester-1.6.jar branches/Seam_1_2_1_AP/examples/booking/resources/WEB-INF/lib/commons-lang-2.1.jar branches/Seam_1_2_1_AP/examples/icefaces/resources/WEB-INF/lib/commons-digester-1.6.jar branches/Seam_1_2_1_AP/examples/spring/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar branches/Seam_1_2_1_AP/examples/spring/resources/WEB-INF/lib/commons-digester-1.6.jar branches/Seam_1_2_1_AP/examples/spring/resources/WEB-INF/lib/commons-lang-2.1.jar branches/Seam_1_2_1_AP/examples/ui/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar branches/Seam_1_2_1_AP/examples/ui/resources/WEB-INF/lib/commons-digester-1.6.jar branches/Seam_1_2_1_AP/examples/ui/resources/WEB-INF/lib/commons-lang-2.1.jar Modified: branches/Seam_1_2_1_AP/.classpath branches/Seam_1_2_1_AP/build.properties branches/Seam_1_2_1_AP/build.xml branches/Seam_1_2_1_AP/examples/booking/build.xml branches/Seam_1_2_1_AP/examples/icefaces/build.xml branches/Seam_1_2_1_AP/examples/spring/build.xml branches/Seam_1_2_1_AP/examples/ui/build.xml Log: JBPAPP-676 removed commons-digester-1.6.jar, commons-beanutils-1.7.0.jar and commons-lang-2.1.jar from examples booking, ui, spring, icefaces. Changed the example build files to copy these files from global lib directory Modified: branches/Seam_1_2_1_AP/.classpath =================================================================== --- branches/Seam_1_2_1_AP/.classpath 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/.classpath 2008-03-20 22:11:32 UTC (rev 7670) @@ -26,16 +26,16 @@ <classpathentry kind="lib" path="lib/myfaces-impl-1.1.4.jar"/> <classpathentry kind="lib" path="lib/ant.jar"/> <classpathentry kind="lib" path="embedded-ejb/conf"/> - <classpathentry kind="lib" path="drools/lib/drools-compiler-3.0.5.jar"/> - <classpathentry kind="lib" path="drools/lib/drools-core-3.0.5.jar"/> <classpathentry kind="lib" path="lib/jsf-facelets.jar"/> <classpathentry kind="lib" path="lib/mail.jar"/> - <classpathentry kind="lib" path="lib/jbpm-3.1.4.jar"/> <classpathentry kind="lib" path="lib/activation.jar"/> <classpathentry kind="lib" path="lib/mail-ra.jar"/> <classpathentry kind="lib" path="lib/spring.jar"/> <classpathentry kind="lib" path="lib/itext-2.0.1.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/> <classpathentry kind="lib" path="lib/jcaptcha-all-1.0-RC4.jar"/> + <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/> + <classpathentry kind="lib" path="drools/lib/drools-compiler-4.0.2.jar"/> + <classpathentry kind="lib" path="drools/lib/drools-core-4.0.2.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/Seam_1_2_1_AP/build.properties =================================================================== --- branches/Seam_1_2_1_AP/build.properties 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/build.properties 2008-03-20 22:11:32 UTC (rev 7670) @@ -1,2 +1,2 @@ -tomcat.home= /var/lib/tomcat5 -jboss.home= /var/lib/jbossas +tomcat.home=C:/Java/apache-tomcat-6.0.10 +jboss.home=G:/jboss-4.2.2.GA Modified: branches/Seam_1_2_1_AP/build.xml =================================================================== --- branches/Seam_1_2_1_AP/build.xml 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/build.xml 2008-03-20 22:11:32 UTC (rev 7670) @@ -204,6 +204,14 @@ dir="${example.webinf.lib.dir}"> <include name="*.jar"/> </zipfileset> + + <fileset id="example.war.webinf.lib.commons" + dir="${lib.dir}"> + <include name="commons-beanutils*.jar" if="example.commons.lib"/> + <include name="commons-digester*.jar" if="example.commons-digester.lib"/> + <include name="commons-lang*.jar" if="example.commons.lib"/> + </fileset> + <fileset id="example.ejb3.resources" dir="${example.resources.dir}"> @@ -1375,6 +1383,10 @@ <filter token="microcontainer" value="false"/> </filterset> </copy> + + <copy todir="${build.dir}/resources/WEB-INF/lib"> + <fileset refid="example.war.webinf.lib.commons"/> + </copy> <jar destfile="${build.dir}/${example.name}.war"> <zipfileset refid="example.war.docroot"/> Modified: branches/Seam_1_2_1_AP/examples/booking/build.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/booking/build.xml 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/examples/booking/build.xml 2008-03-20 22:11:32 UTC (rev 7670) @@ -17,6 +17,10 @@ <property name="src.test.dir" value="src"/> <property name="test.classpath" value="test.eejb.classpath"/> <property name="tomcat.conf" value="eejb.conf"/> + + <property name="example.commons.lib" value="yes"/> + <property name="example.commons-digester.lib" value="yes"/> + <import file="../../build.xml"/> Deleted: branches/Seam_1_2_1_AP/examples/booking/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/examples/booking/resources/WEB-INF/lib/commons-digester-1.6.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/examples/booking/resources/WEB-INF/lib/commons-lang-2.1.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/examples/icefaces/build.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/icefaces/build.xml 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/examples/icefaces/build.xml 2008-03-20 22:11:32 UTC (rev 7670) @@ -15,6 +15,8 @@ <property name="test.classpath" value="test.eejb.classpath"/> <property name="tomcat.conf" value="eejb.conf"/> + <property name="example.commons-digester.lib" value="yes"/> + <import file="../../build.xml"/> </project> Deleted: branches/Seam_1_2_1_AP/examples/icefaces/resources/WEB-INF/lib/commons-digester-1.6.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/examples/spring/build.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/spring/build.xml 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/examples/spring/build.xml 2008-03-20 22:11:32 UTC (rev 7670) @@ -17,6 +17,9 @@ <property name="test.classpath" value="test.eejb.classpath"/> <property name="tomcat.conf" value="eejb.conf"/> + <property name="example.commons.lib" value="yes"/> + <property name="example.commons-digester.lib" value="yes"/> + <import file="../../build.xml"/> <fileset id="example.ear.resources" Deleted: branches/Seam_1_2_1_AP/examples/spring/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/examples/spring/resources/WEB-INF/lib/commons-digester-1.6.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/examples/spring/resources/WEB-INF/lib/commons-lang-2.1.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/examples/ui/build.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/ui/build.xml 2008-03-20 21:49:32 UTC (rev 7669) +++ branches/Seam_1_2_1_AP/examples/ui/build.xml 2008-03-20 22:11:32 UTC (rev 7670) @@ -17,7 +17,10 @@ <property name="src.test.dir" value="src"/> <property name="test.classpath" value="test.eejb.classpath"/> <property name="tomcat.conf" value="eejb.conf"/> - + + <property name="example.commons.lib" value="yes"/> + <property name="example.commons-digester.lib" value="yes"/> + <import file="../../build.xml"/> </project> Deleted: branches/Seam_1_2_1_AP/examples/ui/resources/WEB-INF/lib/commons-beanutils-1.7.0.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/examples/ui/resources/WEB-INF/lib/commons-digester-1.6.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/examples/ui/resources/WEB-INF/lib/commons-lang-2.1.jar =================================================================== (Binary files differ)