[seam-commits] Seam SVN: r14989 - in branches/enterprise/JBPAPP_5_0: examples and 3 other directories.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-07-20 08:07:10 -0400 (Fri, 20 Jul 2012)
New Revision: 14989

Modified:
   branches/enterprise/JBPAPP_5_0/build/gen.pom.xml
   branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml
   branches/enterprise/JBPAPP_5_0/examples/build.xml
   branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml
   branches/enterprise/JBPAPP_5_0/examples/spring/build-jbosswar.xml
   branches/enterprise/JBPAPP_5_0/seam-gen/build.xml
Log:
JBPAPP-8465 cglib and asm are required only for seam-gen, moved to lib/gen and examples are cglib free now

Modified: branches/enterprise/JBPAPP_5_0/build/gen.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/gen.pom.xml	2012-07-20 09:32:16 UTC (rev 14988)
+++ branches/enterprise/JBPAPP_5_0/build/gen.pom.xml	2012-07-20 12:07:10 UTC (rev 14989)
@@ -27,6 +27,18 @@
          <scope>runtime</scope>
       </dependency>
 
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+        <groupId>org.objectweb.asm</groupId>
+        <artifactId>asm</artifactId>
+        <scope>runtime</scope>
+    </dependency>
+    
       <dependency>
          <groupId>freemarker</groupId>
          <artifactId>freemarker</artifactId>

Modified: branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml	2012-07-20 09:32:16 UTC (rev 14988)
+++ branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml	2012-07-20 12:07:10 UTC (rev 14989)
@@ -20,19 +20,19 @@
       <artifactId>spring</artifactId>
       <optional>true</optional>
     </dependency>
-    
+<!--    
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
       <optional>true</optional>
     </dependency>
-    
     <dependency>
     	<groupId>org.objectweb.asm</groupId>
     	<artifactId>asm</artifactId>
     	<optional>true</optional>
     </dependency>
 
+-->    
     <dependency>
       <groupId>org.jboss.seam</groupId>
       <artifactId>jboss-seam</artifactId>

Modified: branches/enterprise/JBPAPP_5_0/examples/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/build.xml	2012-07-20 09:32:16 UTC (rev 14988)
+++ branches/enterprise/JBPAPP_5_0/examples/build.xml	2012-07-20 12:07:10 UTC (rev 14989)
@@ -288,11 +288,12 @@
 		<include name="jxl.jar" if="drools.lib"/>
 	</fileset>
 
-	<!-- Dependencies for using Spring with Cglib -->
+	<!-- Dependencies for using Spring with Cglib - JBoss AS has got these
+	so no need to include them - JBPAPP-8465 
 	<fileset id="cglib.jar" dir="${lib.dir}">
 		<include name="asm.jar" if="cglib.lib"/>
 		<include name="cglib.jar" if="cglib.lib"/>
-	</fileset>
+	</fileset>-->
 
 	<!-- Dependencies for using Seam with JCaptcha -->
 	<fileset id="jcaptcha.jar" dir="${lib.dir}">

Modified: branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml	2012-07-20 09:32:16 UTC (rev 14988)
+++ branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml	2012-07-20 12:07:10 UTC (rev 14989)
@@ -31,8 +31,8 @@
       <include name="lib/hibernate-annotations.jar"/>
       <include name="lib/hibernate-entitymanager.jar"/>
       <include name="lib/hibernate-validator.jar"/>
-      <include name="lib/cglib.jar"/>
-      <include name="lib/asm.jar"/>
+<!--      <include name="lib/cglib.jar"/> -->
+<!--      <include name="lib/asm.jar"/>-->
       <include name="lib/antlr.jar" />
       <include name="lib/commons-logging.jar" />
       <include name="lib/commons-collections.jar" />

Modified: branches/enterprise/JBPAPP_5_0/examples/spring/build-jbosswar.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/spring/build-jbosswar.xml	2012-07-20 09:32:16 UTC (rev 14988)
+++ branches/enterprise/JBPAPP_5_0/examples/spring/build-jbosswar.xml	2012-07-20 12:07:10 UTC (rev 14989)
@@ -20,8 +20,8 @@
 	<!-- needed because jboss must include hibernate search -->
 	<property name="search.lib"   value="true"/>
 	<property name="richfaces.lib" value="true"/>
-	<property name="cglib.lib" value="true"/>
 
+
     <import file="../build.xml"/>
 
 	<fileset id="noejb.jar.extras" dir="${resources.dir}">

Modified: branches/enterprise/JBPAPP_5_0/seam-gen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/build.xml	2012-07-20 09:32:16 UTC (rev 14988)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/build.xml	2012-07-20 12:07:10 UTC (rev 14989)
@@ -1356,8 +1356,8 @@
             <pathelement path="${seam.dir}/lib/commons-collections.jar"/>
             <pathelement path="${seam.dir}/lib/commons-logging.jar"/>
             <pathelement path="${seam.dir}/lib/javassist.jar"/>
-            <pathelement path="${seam.dir}/lib/cglib.jar"/>
-            <pathelement path="${seam.dir}/lib/asm.jar"/>
+            <pathelement path="${seam.dir}/lib/gen/cglib.jar"/>
+        	<pathelement path="${seam.dir}/lib/gen/asm.jar"/>
             <pathelement path="${seam.dir}/lib/gen/core.jar"/>
             <pathelement path="${seam.dir}/lib/jboss-common-core.jar"/>
             <pathelement path="${seam.dir}/lib/concurrent.jar"/>