[jboss-cvs] JBossAS SVN: r93358 - in branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0: embedded and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 10 08:18:23 EDT 2009
Author: manaRH
Date: 2009-09-10 08:18:23 -0400 (Thu, 10 Sep 2009)
New Revision: 93358
Modified:
branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml
branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml
Log:
upgraded versions of hibernate libs, added slf4j-* jars
Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml 2009-09-10 12:08:03 UTC (rev 93357)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml 2009-09-10 12:18:23 UTC (rev 93358)
@@ -74,12 +74,14 @@
<componentref name="easymock" version="1.1"/>
<componentref name="gjt-jpl-util" version="1.0"/>
<componentref name="gnu-getopt" version="1.0.12-brew"/>
- <componentref name="hibernate" version="3.3.1.GA"/>
- <componentref name="hibernate-annotations" version="3.4.0.GA"/>
- <componentref name="hibernate-commons-annotations" version="3.1.0.GA"/>
- <componentref name="hibernate-entitymanager" version="3.4.0.GA"/>
- <componentref name="hibernate-validator" version="3.1.0.GA"/>
- <componentref name="hsqldb" version="1.8.0.8-brew"/>
+ <componentref name="hibernate" version="3.3.2.GA-brew"/>
+ <componentref name="hibernate-annotations" version="3.4.0.GA-brew"/>
+ <componentref name="hibernate-commons-annotations" version="3.1.0.GA-brew"/>
+ <componentref name="hibernate-entitymanager" version="3.4.0.GA-brew"/>
+ <componentref name="hibernate-validator" version="3.1.0.GA-brew"/>
+ <componentref name="slf4j/api" version="1.5.2"/>
+ <componentref name="slf4j/log4j" version="1.5.2"/>
+ <componentref name="hsqldb" version="1.8.0.8.patch02-brew"/>
<componentref name="jacorb" version="2.3.0jboss.patch5-brew"/>
<componentref name="javassist" version="3.6.0.GA"/>
<componentref name="jaxen" version="1.1-brew"/>
Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml 2009-09-10 12:08:03 UTC (rev 93357)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml 2009-09-10 12:18:23 UTC (rev 93358)
@@ -349,7 +349,7 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar">
+ <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar" duplicate="preserve">
<fileset dir="${build.classes}">
<exclude name="org/jboss/embedded/**"/>
</fileset>
@@ -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"/>
@@ -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.SP9"/>
+ <property name="embedded.version" value="embedded-jboss-beta3.SP11"/>
<zip zipfile="${embedded.version}.zip">
<zipfileset dir="." prefix="${embedded.version}">
<include name="DOCUMENTATION.html"/>
More information about the jboss-cvs-commits
mailing list