[jboss-cvs] JBossAS SVN: r93402 - branches/EMBEDDED_JBOSS_BETA3/embedded.

[jboss-cvs-commits at lists.jboss.org]

Author: manaRH
Date: 2009-09-11 08:37:38 -0400 (Fri, 11 Sep 2009)
New Revision: 93402

Modified:
   branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml
Log:
JBPAPP-2711

Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml	2009-09-11 12:11:31 UTC (rev 93401)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml	2009-09-11 12:37:38 UTC (rev 93402)
@@ -369,21 +369,32 @@
          <zipfileset src="${jboss.ejb3.lib}/jboss-annotations-ejb3.jar"/>
          <zipfileset src="${jboss.jboss.javaee.lib}/jboss-javaee.jar"/>
          <zipfileset src="${jboss.integration.lib}/jboss-integration.jar"/>
-         <zipfileset src="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
-      	<zipfileset src="${jboss.aop.lib}/jboss-aop-jboss4-jdk50.jar"/>
-         <zipfileset src="${jboss.aop.lib}/jboss-aop-deployer-jdk50.jar"/>
+         <zipfileset src="${jboss.aop.lib}/jboss-aop-jdk50.jar">
+      		<exclude name="jbossorg-eula.txt" />
+      	</zipfileset>
+      	<zipfileset src="${jboss.aop.lib}/jboss-aop-jboss4-jdk50.jar">
+      		<exclude name="jbossorg-eula.txt" />
+      	</zipfileset>
+         <zipfileset src="${jboss.aop.lib}/jboss-aop-deployer-jdk50.jar">
+      		<exclude name="jbossorg-eula.txt" />
+      	</zipfileset>
          <zipfileset src="${jboss.varia.lib}/hsqldb-plugin.jar"/>
-         <!-- zipfileset src="${jboss.mq.lib}/jbossmq.jar"/> -->
-         <zipfileset src="${jboss.security.int.lib}/jbosssx-server.jar"/>
+         <!-- This is no longer used parallel with ${jboss.messaging.lib}/jboss-messaging.jar"
+         	  it contains same named classes, but different implementations. 
+         <zipfileset src="${jboss.mq.lib}/jbossmq.jar"/> -->
          <zipfileset src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
-         <zipfileset src="${jboss.aspects.lib}/jboss-aop-embedded.jar"/>
+         <zipfileset src="${jboss.aspects.lib}/jboss-aop-embedded.jar"/>      	
+        <!-- these jars contain same classes as  ${jboss.integration.lib}/jboss-integration.jar
          <zipfileset src="${jboss.integration.lib}/jboss-transaction-spi.jar"/>
          <zipfileset src="${jboss.integration.lib}/jboss-classloading-spi.jar"/>
+        --> 
          <zipfileset src="${jboss.naming.lib}/jnpserver.jar"/>
          <zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar"/>
          <zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
          <zipfileset src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar"/>
          <zipfileset src="${jboss.jbossxb.lib}/jboss-xml-binding.jar"/>
+      	 <!-- this jbosssx-server has some classes duplicated in jbosssx.jar-->
+         <zipfileset src="${jboss.security.int.lib}/jbosssx-server.jar"/>
          <zipfileset src="${jboss.jbosssx.lib}/jbosssx.jar"/>
          <zipfileset src="${jboss.jboss.security.spi.lib}/jboss-security-spi.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-kernel.jar"/>
@@ -418,8 +429,12 @@
          <zipfileset src="${jboss.system.lib}/jboss-system.jar"/>
          <zipfileset src="${jboss.systemjmx.lib}/jboss-system-jmx.jar"/>
          <zipfileset src="${jboss.serialization.lib}/jboss-serialization.jar"/>
-         <zipfileset src="${jboss.jbossts.lib}/jbossjta.jar"/>
-         <zipfileset src="${jboss.jbossts.lib}/jbossjta-integration.jar"/>
+         <zipfileset src="${jboss.jbossts.lib}/jbossjta.jar">
+      		<exclude name="built_using_java_1.5" />
+      	</zipfileset>
+         <zipfileset src="${jboss.jbossts.lib}/jbossjta-integration.jar">
+      		<exclude name="built_using_java_1.5" />
+      	</zipfileset>
          <zipfileset src="${jboss.jbossts.lib}/jbossts-common.jar"/>
          <zipfileset src="${jboss.jbossws.lib}/jboss-jaxrpc.jar"/>
          <zipfileset src="${jboss.jbossws.lib}/jboss-jaxws.jar"/>
@@ -438,7 +453,7 @@
       </jar>
 
 
-      <jar jarfile="${build.lib}/embedded-jboss/lib/hibernate-all.jar">
+      <jar jarfile="${build.lib}/embedded-jboss/lib/hibernate-all.jar" duplicate="preserve">
          <zipfileset src="${hibernate.lib}/hibernate3.jar"/>
          <zipfileset src="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/>
          <zipfileset src="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar"/>
@@ -448,7 +463,7 @@
       </jar>
 
 
-      <jar jarfile="${build.lib}/embedded-jboss/lib/thirdparty-all.jar">
+      <jar jarfile="${build.lib}/embedded-jboss/lib/thirdparty-all.jar" duplicate="preserve">
          <zipfileset src="${apache.log4j.lib}/log4j.jar"/>
          <zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar"/>
          <zipfileset src="${antlr.antlr.lib}/antlr.jar"/>
@@ -489,7 +504,7 @@
             <include name="**"/>
          </fileset>
       </javadoc>
-      <property name="embedded.version" value="embedded-jboss-beta3.SP6"/>
+      <property name="embedded.version" value="embedded-jboss-beta3.SP12"/>
       <zip zipfile="${embedded.version}.zip">
          <zipfileset dir="." prefix="${embedded.version}">
             <include name="DOCUMENTATION.html"/>