[jboss-cvs] jboss-ejb3 ...
Ruel Loehr
ruel.loehr at jboss.com
Wed Jul 12 10:14:55 EDT 2006
User: rloehr
Date: 06/07/12 10:14:55
Modified: jboss-ejb3 build.xml
Log:
add zipfileset usage
Revision Changes Path
1.86 +63 -78 jboss-ejb3/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/build.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- build.xml 5 Jul 2006 08:45:41 -0000 1.85
+++ build.xml 12 Jul 2006 14:14:55 -0000 1.86
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.85 2006/07/05 08:45:41 wolfc Exp $ -->
+<!-- $Id: build.xml,v 1.86 2006/07/12 14:14:55 rloehr Exp $ -->
<project default="main" name="JBoss/EJB3">
@@ -348,10 +348,10 @@
</jar>
<!-- build hibernate-client.jar -->
- <unjar src="${hibernate.hibernate.lib}/hibernate3.jar"
- dest="${build.classes}" />
+ <!-- <unjar src="${hibernate.hibernate.lib}/hibernate3.jar"
+ dest="${build.classes}" /> -->
<jar jarfile="${build.lib}/hibernate-client.jar">
- <fileset dir="${build.classes}">
+ <zipfileset src="${hibernate.hibernate.lib}/hibernate3.jar">
<include name="org/hibernate/AssertionFailure.class"/>
<include name="org/hibernate/**/*Exception.class"/>
<include name="org/hibernate/collection/**"/>
@@ -365,9 +365,9 @@
<include name="org/hibernate/EntityMode.class"/>
<include name="org/hibernate/util/**"/>
<include name="org/hibernate/proxy/**"/>
- </fileset>
+ </zipfileset>
</jar>
- <delete dir="${build.classes}/org/hibernate"/>
+
<!-- build client-jar -->
<jar jarfile="${build.lib}/jboss-ejb3-client.jar" manifest="${build.etc}/default.mf">
@@ -496,7 +496,7 @@
<copy todir="${build.lib}" file="${resources}/ejb3-timer-service.xml"/>
<mkdir dir="${build.lib}/embeddable"/>
<mkdir dir="${build.lib}/embeddable/conf"/>
- <mkdir dir="${build.lib}/embeddable/conf"/>
+ <mkdir dir="${build.lib}/embeddable/lib"/>
<copy todir="${build.lib}/embeddable/conf" file="${resources}/ejb3-interceptors-aop.xml"/>
<copy todir="${build.lib}/embeddable/conf" file="${resources}/standalone/embedded-jboss-beans.xml"/>
<copy todir="${build.lib}/embeddable/conf" file="${resources}/standalone/jboss-jms-beans.xml"/>
@@ -506,87 +506,72 @@
<copy todir="${build.lib}/embeddable/conf" file="${resources}/standalone/jndi.properties"/>
<copy tofile="${build.lib}/embeddable/conf/default.persistence.properties" file="${resources}/META-INF/persistence.properties"/>
- <mkdir dir="${build.lib}/embeddable/jboss-classes"/>
- <mkdir dir="${build.lib}/embeddable/hibernate-classes"/>
- <mkdir dir="${build.lib}/embeddable/thirdparty-classes"/>
- <mkdir dir="${build.lib}/embeddable/lib"/>
- <unjar src="${build.lib}/jboss-ejb3.jar"
- dest="${build.lib}/embeddable/jboss-classes"/>
+ <jar jarfile="${build.lib}/embeddable/lib/jboss-ejb3-all.jar">
+ <zipfileset src="${build.lib}/jboss-ejb3.jar"/>
+ <zipfileset src="${build.lib}/jboss-annotations-ejb3.jar"/>
+ <zipfileset src="${build.lib}/jboss-annotations-ejb3.jar"/>
+ <zipfileset src="${jboss.ejb3x.lib}/jboss-ejb3x.jar"/>
+ <zipfileset src="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
+ <zipfileset src="${jboss.varia.lib}/hsqldb-plugin.jar" />
+ <zipfileset src="${jboss.messaging.lib}/jbossmq.jar" />
+ <zipfileset src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar" />
+ <zipfileset src="${jboss.transaction.lib}/jboss-transaction.jar" />
+ <zipfileset src="${jboss.naming.lib}/jnpserver.jar" />
+ <zipfileset src="${jboss.j2ee.lib}/jboss-j2ee.jar" />
+ <zipfileset src="${jboss.common.lib}/jboss-common.jar" />
+ <zipfileset src="${jboss.jbossxb.lib}/jboss-xml-binding.jar" />
+ <zipfileset src="${jboss.security.lib}/jbosssx.jar" />
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-microcontainer.jar" />
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-container.jar" />
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-dependency.jar" />
+ <zipfileset src="${jboss.server.lib}/jboss.jar" />
+ <zipfileset src="${jboss.remoting.lib}/jboss-remoting.jar" />
+ <zipfileset src="${jboss.j2se.lib}/jboss-j2se.jar" />
+ <zipfileset src="${jboss.jca.lib}/jboss-jca.jar" />
+ <zipfileset src="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar" />
+ <zipfileset src="${jboss.jca.lib}/jboss-local-jdbc.jar" />
+ <zipfileset src="${jboss.jca.lib}/jboss-xa-jdbc.jar" />
+ <zipfileset src="${jboss.system.lib}/jboss-system.jar" />
+ <zipfileset src="${jboss.serialization.lib}/jboss-serialization.jar" />
+ <zipfileset src="${jboss.j2ee.lib}/jboss-jaxrpc.jar" />
+ </jar>
- <unjar src="${build.lib}/jboss-annotations-ejb3.jar"
- dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${build.lib}/jboss-annotations-ejb3.jar"
- dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.ejb3x.lib}/jboss-ejb3x.jar"
- dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.aop.lib}/jboss-aop-jdk50.jar"
- dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.varia.lib}/hsqldb-plugin.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.messaging.lib}/jbossmq.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.transaction.lib}/jboss-transaction.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.naming.lib}/jnpserver.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.j2ee.lib}/jboss-j2ee.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${apache.log4j.lib}/log4j.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${jboss.common.lib}/jboss-common.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.jbossxb.lib}/jboss-xml-binding.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.security.lib}/jbosssx.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.microcontainer.lib}/jboss-microcontainer.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.microcontainer.lib}/jboss-container.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.microcontainer.lib}/jboss-dependency.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.server.lib}/jboss.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.remoting.lib}/jboss-remoting.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.j2se.lib}/jboss-j2se.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.jca.lib}/jboss-jca.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.jca.lib}/jboss-local-jdbc.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.jca.lib}/jboss-xa-jdbc.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.system.lib}/jboss-system.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.serialization.lib}/jboss-serialization.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${jboss.j2ee.lib}/jboss-jaxrpc.jar" dest="${build.lib}/embeddable/jboss-classes"/>
- <unjar src="${hsqldb.hsqldb.lib}/hsqldb.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${hibernate.lib}/hibernate3.jar" dest="${build.lib}/embeddable/hibernate-classes"/>
- <unjar src="${hibernate.entitymanager.lib}/ejb3-persistence.jar" dest="${build.lib}/embeddable/hibernate-classes"/>
- <unjar src="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar" dest="${build.lib}/embeddable/hibernate-classes"/>
- <unjar src="${hibernate.annotations.lib}/hibernate-annotations.jar" dest="${build.lib}/embeddable/hibernate-classes"/>
- <unjar src="${asm.asm.lib}/asm.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${asm.asm.lib}/asm-attrs.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${antlr.antlr.lib}/antlr-2.7.6.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${cglib.lib}/cglib.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${dom4j.dom4j.lib}/dom4j.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${apache.logging.api.lib}/commons-logging-api.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${apache.logging.lib}/commons-logging.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${apache.collections.lib}/commons-collections.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${oswego.concurrent.lib}/concurrent.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${apache.xerces.lib}/resolver.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${apache.xerces.lib}/xercesImpl.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${apache.xerces.lib}/xml-apis.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${javassist.lib}/javassist.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${trove.lib}/trove.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <unjar src="${quartz.quartz.lib}/quartz-all-1.5.2.jar" dest="${build.lib}/embeddable/thirdparty-classes"/>
- <jar jarfile="${build.lib}/embeddable/lib/jboss-ejb3-all.jar">
- <fileset dir="${build.lib}/embeddable/jboss-classes">
- <include name="**/*"/>
- </fileset>
- </jar>
<jar jarfile="${build.lib}/embeddable/lib/hibernate-all.jar">
- <fileset dir="${build.lib}/embeddable/hibernate-classes">
- <include name="**/*"/>
- </fileset>
+ <zipfileset src="${hibernate.lib}/hibernate3.jar" />
+ <zipfileset src="${hibernate.entitymanager.lib}/ejb3-persistence.jar" />
+ <zipfileset src="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar" />
+ <zipfileset src="${hibernate.annotations.lib}/hibernate-annotations.jar" />
</jar>
+
+
<jar jarfile="${build.lib}/embeddable/lib/thirdparty-all.jar">
- <fileset dir="${build.lib}/embeddable/thirdparty-classes">
- <include name="**/*"/>
- </fileset>
+ <zipfileset src="${apache.log4j.lib}/log4j.jar" />
+ <zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar" />
+ <zipfileset src="${asm.asm.lib}/asm.jar" />
+ <zipfileset src="${asm.asm.lib}/asm-attrs.jar" />
+ <zipfileset src="${antlr.antlr.lib}/antlr-2.7.6.jar" />
+ <zipfileset src="${cglib.lib}/cglib.jar" />
+ <zipfileset src="${dom4j.dom4j.lib}/dom4j.jar" />
+ <zipfileset src="${apache.logging.api.lib}/commons-logging-api.jar" />
+ <zipfileset src="${apache.logging.lib}/commons-logging.jar" />
+ <zipfileset src="${apache.collections.lib}/commons-collections.jar" />
+ <zipfileset src="${oswego.concurrent.lib}/concurrent.jar" />
+ <zipfileset src="${apache.xerces.lib}/resolver.jar" />
+ <zipfileset src="${apache.xerces.lib}/xercesImpl.jar" />
+ <zipfileset src="${apache.xerces.lib}/xml-apis.jar" excludes="**/license"/>
+ <zipfileset src="${javassist.lib}/javassist.jar" />
+ <zipfileset src="${trove.lib}/trove.jar" />
+ <zipfileset src="${quartz.quartz.lib}/quartz-all-1.5.2.jar" />
</jar>
<copy tofile="${build.lib}/embeddable/lib/jms-ra.rar" file="${jboss.jca.lib}/jms-ra.rar"/>
<copy tofile="${build.lib}/embeddable/lib/jms-ra.jar" file="${jboss.jca.lib}/jms-ra.jar"/>
</target>
+
<!-- ================================================================== -->
<!-- Install & Release -->
<!-- ================================================================== -->
More information about the jboss-cvs-commits
mailing list