[jboss-cvs] JBossAS SVN: r60591 - branches/Branch_4_2/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 16 12:06:22 EST 2007
Author: dimitris at jboss.org
Date: 2007-02-16 12:06:22 -0500 (Fri, 16 Feb 2007)
New Revision: 60591
Modified:
branches/Branch_4_2/build/build-distr.xml
branches/Branch_4_2/build/build.xml
Log:
Merge the ejb3 stuff to the standard jboss default/all configs
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2007-02-16 16:42:26 UTC (rev 60590)
+++ branches/Branch_4_2/build/build-distr.xml 2007-02-16 17:06:22 UTC (rev 60591)
@@ -224,11 +224,27 @@
value="${project.root}/${_module.name}/output"/>
<!-- Copy the generated libraries -->
- <copy todir="${install.server}/all/deploy/jboss-aop.deployer">
- <fileset dir="${_module.output}/lib/jboss-aop.deployer" />
+ <copy todir="${install.server}/all/deploy/jboss-aop-jdk50.deployer">
+ <fileset dir="${_module.output}/lib/jboss-aop-jdk50.deployer" />
</copy>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-aspect-jdk50-client.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy thirdparty client libraries -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop-jdk50-client.jar"/>
+ </fileset>
+ </copy>
+
</target>
-
+
<target name="_module-aspects-all" depends="_module-aspects-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1259,43 +1275,37 @@
<mkdir dir="${install.all.lib}"/>
- <!-- The hibernate-int module output -->
+ <!-- Copy the generated libraries -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${_module.output}/lib" includes="*.jar" />
</copy>
- <!-- The hibernate jar -->
+ <!-- Copy thirdparty libraries -->
<copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${hibernate.lib}" includes="*.jar" />
+ <!-- the hibernate jar -->
+ <fileset dir="${hibernate.lib}" includes="*.jar" />
+ <!-- hibernate entity manager -->
+ <fileset dir="${hibernate.entitymanager.lib}">
+ <include name="hibernate-entitymanager.jar"/>
+ </fileset>
+ <!-- hibernate annotations -->
+ <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
+ <!-- antlr jar -->
+ <fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
+ <!-- commons collections -->
+ <fileset dir="${apache.collections.lib}" includes="*.jar"/>
+ <!-- cglib jar & asm dependency
+ <fileset dir="${cglib.lib}" includes="*.jar"/>
+ <fileset dir="${asm.asm.lib}" includes="*.jar" /> -->
</copy>
-
- <!-- ASM jars (cglib dependency)
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${asm.asm.lib}" includes="*.jar" />
- </copy>
- -->
-
- <!-- ANTLR jar -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${antlr.antlr.lib}" includes="antlr.jar" />
- </copy>
- <!-- Copy the generated client libraries -->
+
+ <!-- Copy thirdparty client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${antlr.antlr.lib}" includes="antlr.jar" />
+ <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
</copy>
- <!-- CGLIB jar
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${cglib.lib}" includes="*.jar"/>
- </copy>
- -->
-
- <!-- Commons collections jar -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${apache.collections.lib}" includes="*.jar"/>
- </copy>
-
</target>
<target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
@@ -1308,35 +1318,79 @@
</copy>
</target>
- <!-- ======== -->
- <!-- EJB 3.0 -->
- <!-- ======== -->
+ <!-- ======== -->
+ <!-- EJB 3.0 -->
+ <!-- ======== -->
- <target name="_module-ejb3-most" if="HAVE_JDK_1.5">
- </target>
+ <target name="_module-ejb3-most" if="HAVE_JDK_1.5">
+ <property name="_module.name" value="ejb3" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+
+ <!-- Copy the deployables -->
+ <mkdir dir="${install.server}/all/deploy"/>
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="ejb3.deployer/**"/>
+ <include name="ejb3-interceptors-aop.xml"/>
+ <include name="ejb3-entity-cache-service.xml"/>
+ <include name="ejb3-clustered-sfsbcache-service.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-ejb3-client.jar"/>
+ <include name="jboss-annotations-ejb3.jar"/>
+ <include name="hibernate-client.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy thirdparty libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${hibernate.entitymanager.lib}" includes="ejb3-persistence.jar"/>
+ </copy>
+
+ <!-- Copy thirdparty client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${trove.trove.lib}" includes="trove.jar" />
+ <fileset dir="${hibernate.entitymanager.lib}" includes="ejb3-persistence.jar"/>
+ </copy>
+ </target>
<target name="_module-ejb3-all" depends="_module-ejb3-most" if="HAVE_JDK_1.5">
</target>
- <!-- ======== -->
- <!-- EJB3X -->
- <!-- ======== -->
+ <!-- ======== -->
+ <!-- EJB3X -->
+ <!-- ======== -->
- <target name="_module-ejb3x-most" if="HAVE_JDK_1.5">
+ <target name="_module-ejb3x-most" if="HAVE_JDK_1.5">
+ <property name="_module.name" value="ejb3x" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-ejb3x.jar"/>
+ </fileset>
+ </copy>
+
</target>
- <target name="_module-aspects-jdk5-most" if="HAVE_JDK_1.5">
- </target>
-
- <target name="_module-aspects-jdk5-all" depends="_module-aspects-jdk5-most">
- </target>
-
<!-- ======== -->
<!-- Thirdparty -->
<!-- ======== -->
<target name="thirdparty">
- <!-- Copy thirdparty libraries -->
+
+ <!-- Copy thirdparty libraries to root lib dir -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
<fileset dir="${jboss.common.lib}">
@@ -1469,7 +1523,11 @@
<!-- Jaxen is an implicit dependency of dom4j -->
<fileset dir="${jaxen.jaxen.lib}">
<include name="jaxen.jar"/>
- </fileset>
+ </fileset>
+ <!-- Quartz needed by quartz-ra.rar -->
+ <!-- Future feature request JBAS-3206
+ <fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
+ -->
</copy>
<!-- install thirdparty items to install/bin -->
@@ -1480,153 +1538,11 @@
</patternset>
</unjar>
- <!-- Install JBossWS without dependency on EJB3 -->
+ <!-- Install JBossWS -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws42.sar"/>
- <copy tofile="${install.all.deploy}/jbossws.sar/META-INF/jboss-service.xml" file="${install.all.deploy}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
- <delete file="${install.all.deploy}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
- </target>
+ <!--<delete file="${install.all.deploy}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>-->
-
-
-
- <!-- ========= -->
- <!-- EJB3 Dist -->
- <!-- ========= -->
-
- <target name="setup-ejb3-dist" if="HAVE_JDK_1.5"
- description="Create an ejb3.dist from jboss.dist">
-
- <copy todir="${install.ejb3.root}">
- <fileset dir="${install.root}">
- <include name="bin/**" />
- <include name="client/**" />
- <include name="lib/**" />
- </fileset>
- </copy>
- <!-- QUARTZ jar/rar -->
- <copy todir="${install.ejb3.root}/server/all/lib" filtering="no">
- <fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
- </copy>
- <copy todir="${install.ejb3.root}/server/default/lib" filtering="no">
- <fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
- </copy>
- <copy todir="${install.ejb3.root}/server/all/deploy" filtering="no">
- <fileset dir="${project.root}/connector/output/lib" includes="quartz-ra.rar"/>
- </copy>
- <copy todir="${install.ejb3.root}/server/default/deploy" filtering="no">
- <fileset dir="${project.root}/connector/output/lib" includes="quartz-ra.rar"/>
- </copy>
-
- <!-- ebernard augment the server dir with hibernate annotations and entitymanaget
- this seems to be a yukky solution, it really has to be part of the
- ejb3 deployer build process -->
- <copy todir="${install.ejb3.root}/server/all/lib" filtering="no">
- <fileset dir="${hibernate.entitymanager.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${hibernate.annotations.lib}">
- <include name="*.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.ejb3.root}/server/default/lib" filtering="no">
- <fileset dir="${hibernate.entitymanager.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${hibernate.annotations.lib}">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- <!-- Augment the client jars with the jdk5 client jars -->
- <copy todir="${install.ejb3.root}/client"
- file="${project.root}/aspects/output/lib/jboss-aspect-jdk50-client.jar" />
- <copy todir="${install.ejb3.root}/client"
- file="${jboss.aop.lib}/jboss-aop-jdk50-client.jar" />
- <copy todir="${install.ejb3.root}/client"
- file="${project.root}/ejb3/output/lib/jboss-ejb3-client.jar" />
- <copy todir="${install.ejb3.root}/client"
- file="${project.root}/ejb3/output/lib/hibernate-client.jar" />
- <copy todir="${install.ejb3.root}/client"
- file="${project.root}/ejb3/output/lib/jboss-annotations-ejb3.jar" />
- <copy todir="${install.ejb3.root}/client"
- file="${project.root}/ejb3x/output/lib/jboss-ejb3x.jar" />
- <copy todir="${install.ejb3.root}/client"
- file="${trove.trove.lib}/trove.jar"/>
- <copy todir="${install.ejb3.root}/client">
- <fileset dir="${hibernate.entitymanager.lib}">
- <include name="ejb3-persistence.jar"/>
- </fileset>
- <fileset dir="${hibernate.annotations.lib}">
- <include name="hibernate-annotations.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy default and all configs -->
- <copy todir="${install.ejb3.root}/server/default">
- <fileset dir="${install.root}/server/default">
- <include name="conf/**" />
- <include name="deploy/**" />
- <include name="lib/**" />
- <exclude name="deploy/jbossws.sar/**" />
- </fileset>
- </copy>
-
- <copy todir="${install.ejb3.root}/server/all">
- <fileset dir="${install.root}/server/all">
- <include name="conf/**" />
- <include name="deploy/**" />
- <include name="deploy-hasingleton/**" />
- <include name="farm/**" />
- <include name="lib/**" />
- <exclude name="deploy/jbossws.sar/**" />
- </fileset>
- </copy>
-
- <!-- Copy the ejb3 deployer services -->
- <delete includeEmptyDirs="true">
- <fileset dir="${install.ejb3.root}/server/default/deploy">
- <include name="jboss-aop.deployer/**" />
- </fileset>
- </delete>
-
- <copy todir="${install.ejb3.root}/server/default/deploy" filtering="no">
- <fileset dir="${project.root}/ejb3/output/lib">
- <include name="ejb3.deployer/**"/>
- <include name="ejb3-interceptors-aop.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${install.ejb3.root}/server/default/deploy/jboss-aop-jdk50.deployer">
- <fileset dir="${project.root}/aspects/output/lib/jboss-aop-jdk50.deployer" />
- </copy>
-
- <!-- Install JBossWS -->
- <mkdir dir="${install.ejb3.root}/server/default/deploy/jbossws.sar"/>
- <unjar dest="${install.ejb3.root}/server/default/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws42.sar"/>
- <delete file="${install.ejb3.root}/server/default/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
-
- <delete includeEmptyDirs="true">
- <fileset dir="${install.ejb3.root}/server/all/deploy">
- <include name="jboss-aop.deployer/**" />
- </fileset>
- </delete>
- <copy todir="${install.ejb3.root}/server/all/deploy" filtering="no">
- <fileset dir="${project.root}/ejb3/output/lib">
- <include name="ejb3.deployer/**"/>
- <include name="ejb3-interceptors-aop.xml"/>
- <include name="ejb3-entity-cache-service.xml"/>
- <include name="ejb3-clustered-sfsbcache-service.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.ejb3.root}/server/all/deploy/jboss-aop-jdk50.deployer">
- <fileset dir="${project.root}/aspects/output/lib/jboss-aop-jdk50.deployer" />
- </copy>
-
- <!-- Install JBossWS -->
- <mkdir dir="${install.ejb3.root}/server/all/deploy/jbossws.sar"/>
- <unjar dest="${install.ejb3.root}/server/all/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws42.sar"/>
- <delete file="${install.ejb3.root}/server/all/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
</target>
</project>
Modified: branches/Branch_4_2/build/build.xml
===================================================================
--- branches/Branch_4_2/build/build.xml 2007-02-16 16:42:26 UTC (rev 60590)
+++ branches/Branch_4_2/build/build.xml 2007-02-16 17:06:22 UTC (rev 60591)
@@ -78,7 +78,7 @@
<!-- The group to use by default -->
<property name="groups" value="most"/>
- <condition property="build-jdk5" value="aspects-jdk5,ejb3x,ejb3">
+ <condition property="build-jdk5" value="ejb3x,ejb3">
<isset property="HAVE_JDK_1.5"/>
</condition>
<property name="build-jdk5" value=""/>
@@ -88,7 +88,6 @@
<!-- Modules -->
<module name="aspects"/>
- <module name="aspects-jdk5"/>
<module name="cluster"/>
<module name="connector"/>
<module name="console"/>
@@ -523,11 +522,11 @@
<!-- Aspects -->
<!-- ========== -->
- <target name="_module-aspects-most">
+ <target name="_module-aspects-most" if="HAVE_JDK_1.5">
<ant antfile="build-distr.xml" target="_module-aspects-most"/>
</target>
- <target name="_module-aspects-all" depends="_module-aspects-most">
+ <target name="_module-aspects-all" depends="_module-aspects-most" if="HAVE_JDK_1.5">
<ant antfile="build-distr.xml" target="_module-aspects-all"/>
</target>
@@ -567,18 +566,6 @@
<ant antfile="build-distr.xml" target="_module-ejb3x-most"/>
</target>
- <!-- ========== -->
- <!-- Aspects -->
- <!-- ========== -->
-
- <target name="_module-aspects-jdk5-most" if="HAVE_JDK_1.5">
- <ant antfile="build-distr.xml" target="_module-aspects-jdk5-most"/>
- </target>
-
- <target name="_module-aspects-jdk5-all" depends="_module-aspects-most" if="HAVE_JDK_1.5">
- <ant antfile="build-distr.xml" target="_module-aspects-jdk5-all"/>
- </target>
-
<!-- ================================================================== -->
<!-- Install & Release -->
<!-- ================================================================== -->
@@ -628,7 +615,7 @@
<antcall target="partition-default"/>
<antcall target="partition-minimal"/>
<antcall target="jboss-all-client"/>
- <antcall target="setup-ejb3-dist"/>
+ <!--<antcall target="setup-ejb3-dist"/>-->
</target>
<target name="partition-default"
@@ -657,6 +644,8 @@
<exclude name="lib/xmlsec.jar"/>
<exclude name="deploy/cluster-service.xml"/>
<exclude name="deploy/deploy-hasingleton-service.xml"/>
+ <exclude name="deploy/ejb3-entity-cache-service.xml"/>
+ <exclude name="deploy/ejb3-clustered-sfsbcache-service.xml"/>
<exclude name="deploy/iiop-service.xml"/>
<exclude name="deploy/httpha-invoker.sar/**"/>
<exclude name="deploy/jbossweb-ejb.jar"/>
More information about the jboss-cvs-commits
mailing list