[Jboss-cvs] JBossAS SVN: r55923 - branches/JEE5_TCK/build
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 14 18:01:39 EDT 2006
Author: prabhat.jha at jboss.com
Date: 2006-08-14 18:01:37 -0400 (Mon, 14 Aug 2006)
New Revision: 55923
Modified:
branches/JEE5_TCK/build/build-distr.xml
branches/JEE5_TCK/build/build-thirdparty.xml
branches/JEE5_TCK/build/build.xml
Log:
modified to include jboss messaging as JMS impl instead of jbossMQ. verified that both all and default instances start without any problem
Modified: branches/JEE5_TCK/build/build-distr.xml
===================================================================
--- branches/JEE5_TCK/build/build-distr.xml 2006-08-14 21:58:01 UTC (rev 55922)
+++ branches/JEE5_TCK/build/build-distr.xml 2006-08-14 22:01:37 UTC (rev 55923)
@@ -576,12 +576,14 @@
<include name="jbossjca-service.xml"/>
</fileset>
</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">
@@ -617,12 +619,14 @@
<!--include name="postgres-service.xml"/-->
</fileset>
</copy>
+ <!--
<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 the generated client libraries -->
<mkdir dir="${install.client}"/>
@@ -655,103 +659,9 @@
<include name="**/*"/>
</fileset>
</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>
-
+ </target>
+
+
<!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
@@ -1187,7 +1097,9 @@
</fileset>
</copy>
+
<!-- Include the HTTP invoker service unpacked -->
+ <!--
<delete dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
<mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
<unjar src="${_module.output}/lib/jbossmq-httpil.sar"
@@ -1198,7 +1110,7 @@
<unjar src="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war"
dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war" />
<delete file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war" />
-
+-->
<!-- copy the jboss-monitoring JAR -->
<copy file="${project.root}/varia/output/lib/jboss-monitoring.jar"
todir="${install.server}/all/lib"/>
@@ -1805,8 +1717,15 @@
<include name="jboss-cache-jdk50.jar"/>
</fileset>
</copy>
+
+ <!--Copy jboss-messaging libraries-->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${jboss/jboss.messaging.lib}">
+ <include name="jboss-messaging.jar"/>
+ </fileset>
+ </copy>
-
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
Modified: branches/JEE5_TCK/build/build-thirdparty.xml
===================================================================
--- branches/JEE5_TCK/build/build-thirdparty.xml 2006-08-14 21:58:01 UTC (rev 55922)
+++ branches/JEE5_TCK/build/build-thirdparty.xml 2006-08-14 22:01:37 UTC (rev 55923)
@@ -99,6 +99,7 @@
<componentref name="jboss/jbossretro" version="snapshot"/>
<componentref name="jboss/jbossws14" version="1.0.1.GA"/>
<componentref name="jboss/jbossws" version="1.0.1.GA"/>
+ <componentref name="jboss/jboss-messaging" version="1.0.1.CR4"/>
<componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/microcontainer14" version="snapshot"/>
<componentref name="jboss/remoting" version="1.4.3.GA"/>
Modified: branches/JEE5_TCK/build/build.xml
===================================================================
--- branches/JEE5_TCK/build/build.xml 2006-08-14 21:58:01 UTC (rev 55922)
+++ branches/JEE5_TCK/build/build.xml 2006-08-14 22:01:37 UTC (rev 55923)
@@ -104,12 +104,10 @@
<module name="hibernate-int"/>
<module name="iiop"/>
<module name="j2ee"/>
- <module name="j2se"/>
- <module name="jms"/>
+ <module name="j2se"/>
<module name="jmx"/>
<module name="management"/>
- <module name="mbeans"/>
- <module name="messaging"/>
+ <module name="mbeans"/>
<module name="naming"/>
<module name="jbossas/remoting"/>
<module name="jmx-remoting"/>
@@ -151,7 +149,6 @@
<include modules="jbossas/remoting,
jmx-remoting,
jbossas/jmx-remoting,
- messaging,
connector,
cluster,
varia,
@@ -159,8 +156,7 @@
management,
aspects,
tomcat,
- hibernate-int,
- jms,
+ hibernate-int,
console,
${buildejb3}
webservice
@@ -475,30 +471,6 @@
<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 -->
<!-- ==== -->
@@ -754,8 +726,7 @@
<exclude name="deploy/hajndi-service.xml"/>
<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/jbossweb-ejb.jar"/>
<exclude name="deploy/deploy.last/**"/>
<exclude name="deploy/httpha-invoker.sar/**"/>
<exclude name="deploy/snmp-adaptor.sar/**"/>
@@ -769,18 +740,6 @@
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