[Jboss-cvs] JBossAS SVN: r56004 - branches/JEE5_TCK/build
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 16 16:42:29 EDT 2006
Author: prabhat.jha at jboss.com
Date: 2006-08-16 16:42:28 -0400 (Wed, 16 Aug 2006)
New Revision: 56004
Modified:
branches/JEE5_TCK/build/build-distr.xml
branches/JEE5_TCK/build/build.xml
Log:
as per Ryan's suggestion, reverted most of changes with messaging and jbossmq. we would still build jbossmq, it just wont get deployed
Modified: branches/JEE5_TCK/build/build-distr.xml
===================================================================
--- branches/JEE5_TCK/build/build-distr.xml 2006-08-16 19:49:15 UTC (rev 56003)
+++ branches/JEE5_TCK/build/build-distr.xml 2006-08-16 20:42:28 UTC (rev 56004)
@@ -575,15 +575,14 @@
<fileset dir="${_module.output}/resources/jca-sar">
<include name="jbossjca-service.xml"/>
</fileset>
- </copy>
- <!--
+ </copy>
<mkdir dir="${install.all.deploy}/jms"/>
<copy todir="${install.all.deploy}/jms" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jms-ra.rar"/>
</fileset>
</copy>
- -->
+
<mkdir dir="${install.server}/all/lib"/>
<copy todir="${install.server}/all/lib" filtering="no">
@@ -619,14 +618,12 @@
<!--include name="postgres-service.xml"/-->
</fileset>
</copy>
- <!--
- <mkdir dir="${install.all.deploy}/jms"/>
+ <mkdir dir="${install.all.deploy}/jms"/>
<copy todir="${install.all.deploy}/jms" filtering="no">
<fileset dir="${_module.output}/etc/example-config">
<include name="hajndi-jms-ds.xml"/>
</fileset>
- </copy>
- -->
+ </copy>
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
@@ -661,6 +658,104 @@
</copy>
</target>
+ <!-- ========= -->
+ <!-- messaging-->
+ <!-- ========= -->
+<target name="_module-messaging-most">
+ <property name="_module.name" value="messaging" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jbossmq.jar"/>
+ </fileset>
+ </copy>
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="*-client.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Default server config -->
+
+ <!-- Copy the default jbossmq deployment configuration -->
+ <!--
+ <mkdir dir="${install.all.deploy.hasingleton}/jms"/>
+ <copy todir="${install.all.deploy.hasingleton}/jms" filtering="no">
+ <fileset dir="${_module.output}/etc/server/default/deploy">
+ <include name="**"/>
+ </fileset>
+ </copy>
+-->
+ <!-- Copy example jms configs -->
+ <!--
+ <mkdir dir="${install.examples.jms}"/>
+ <copy todir="${install.examples.jms}" filtering="no">
+ <fileset dir="${_module.output}/etc/server/examples/deploy">
+ <include name="*.xml"/>
+ <include name="conf/*.xml"/>
+ <include name="standalone/*.xml"/>
+ </fileset>
+ </copy>
+-->
+ </target>
+
+ <target name="_module-messaging-all" depends="_module-messaging-most">
+ <!-- Copy the generated javadocs -->
+<!--
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+-->
+ </target>
+
+ <!-- =========== -->
+ <!-- Messaging 5 -->
+ <!-- =========== -->
+
+ <target name="_module-jms-most">
+ <property name="_module.name" value="jms" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+
+ <!-- Copy the generated libraries -->
+<!--
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-messaging.jar"/>
+ </fileset>
+ </copy>
+-->
+ <!-- Copy the generated client libraries -->
+<!--
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="*-client.jar"/>
+ </fileset>
+ </copy>
+-->
+ </target>
+
+ <target name="_module-jms-all" depends="_module-jms-most">
+ <!-- Copy the generated javadocs -->
+<!--
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+-->
+ </target>
<!-- ==== -->
<!-- J2SE -->
Modified: branches/JEE5_TCK/build/build.xml
===================================================================
--- branches/JEE5_TCK/build/build.xml 2006-08-16 19:49:15 UTC (rev 56003)
+++ branches/JEE5_TCK/build/build.xml 2006-08-16 20:42:28 UTC (rev 56004)
@@ -105,9 +105,11 @@
<module name="iiop"/>
<module name="j2ee"/>
<module name="j2se"/>
+ <module name="jms"/>
<module name="jmx"/>
<module name="management"/>
<module name="mbeans"/>
+ <module name="messaging"/>
<module name="naming"/>
<module name="jbossas/remoting"/>
<module name="jmx-remoting"/>
@@ -149,6 +151,7 @@
<include modules="jbossas/remoting,
jmx-remoting,
jbossas/jmx-remoting,
+ messaging,
connector,
cluster,
varia,
@@ -157,6 +160,7 @@
aspects,
tomcat,
hibernate-int,
+ jms,
console,
${buildejb3}
webservice
@@ -471,6 +475,29 @@
<ant antfile="build-distr.xml" target="_module-connector-all"/>
</target>
+<!-- ========= -->
+ <!-- Messaging -->
+ <!-- ========= -->
+
+ <target name="_module-messaging-most">
+ <ant antfile="build-distr.xml" target="_module-messaging-most"/>
+ </target>
+
+ <target name="_module-messaging-all" depends="_module-messaging-most">
+ <ant antfile="build-distr.xml" target="_module-messaging-all"/>
+ </target>
+
+ <!-- =========== -->
+ <!-- Messaging 5 -->
+ <!-- =========== -->
+
+ <target name="_module-jms-most">
+ <ant antfile="build-distr.xml" target="_module-jms-most"/>
+ </target>
+
+ <target name="_module-jms-all" depends="_module-jms-most">
+ <ant antfile="build-distr.xml" target="_module-jms-all"/>
+ </target>
<!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
@@ -727,6 +754,7 @@
<exclude name="deploy/deploy-hasingleton-service.xml"/>
<exclude name="deploy/iiop-service.xml"/>
<exclude name="deploy/jbossweb-ejb.jar"/>
+ <exclude name="deploy/jms/hajndi-jms-ds.xml"/>
<exclude name="deploy/deploy.last/**"/>
<exclude name="deploy/httpha-invoker.sar/**"/>
<exclude name="deploy/snmp-adaptor.sar/**"/>
@@ -740,6 +768,20 @@
file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
<copy tofile="${install.default.deploy}/jbossweb-tomcat6.sar/META-INF/jboss-service.xml"
file="${project.root}/tomcat/src/resources/jboss-service.xml" overwrite="true"/>
+<!--
+ <copy todir="${install.default.deploy}">
+ <fileset dir="${install.all.deploy.hasingleton}">
+ <include name="jms/**"/>-->
+ <!-- Trim the default config jms layer to only the JVM/UIL2 invoker -->
+<!-- <exclude name="jms/jbossmq-hail.sar/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.default.deploy}/jms">
+ <fileset dir="${install.examples.jca}">
+ <include name="jms-ds.xml"/>
+ </fileset>
+ </copy>
+-->
<unjar src="${project.root}/varia/output/lib/http-invoker.sar"
dest="${install.default}/deploy/http-invoker.sar"/>
More information about the jboss-cvs-commits
mailing list