[jboss-cvs] JBossAS SVN: r81487 - in trunk: build and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Nov 24 09:00:13 EST 2008


Author: adrian at jboss.org
Date: 2008-11-24 09:00:12 -0500 (Mon, 24 Nov 2008)
New Revision: 81487

Removed:
   trunk/jbossmq/
   trunk/testsuite/imports/sections/jbossmq.xml
   trunk/testsuite/src/main/org/jboss/test/jbossmq/
   trunk/testsuite/src/resources/jbossmq/
   trunk/testsuite/src/resources/org/jboss/test/jbossmq/
Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/testsuite/build.xml
   trunk/testsuite/imports/test-jars.xml
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossMessagingJoramUnitTestCase.java
   trunk/varia/pom.xml
Log:
[JBAS-6238] - Remove JBossMQ

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/build/build-distr.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -683,28 +683,6 @@
   </target>
 
   <!-- ========= -->
-  <!-- Legacy JBossMQ -->
-  <!-- ========= -->
-
-  <target name="_module-jbossmq-most">
-    <property name="_module.name" value="jbossmq" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
-    <!-- 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>
-    <!-- TODO: include legacy deploy contents as an example -->
-  </target>
-  <target name="_module-jbossmq-all" depends="_module-jbossmq-most">
-  </target>
-
-  <!-- ========= -->
   <!-- Messaging -->
   <!-- ========= -->
 

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/build/build.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -97,7 +97,6 @@
       <module name="management"/>
       <module name="mbeans"/>
       <module name="messaging"/>
-      <module name="jbossmq"/>
       <module name="jbossas/remoting"/>
       <module name="jmx-remoting"/>
       <module name="jbossas/jmx-remoting"/>
@@ -137,7 +136,6 @@
                           jmx-remoting,
                           jbossas/jmx-remoting,
                           messaging,
-                          jbossmq,
                           cluster,
                           varia,
                           iiop,
@@ -873,7 +871,6 @@
       <include name="jboss-jaxws.jar"/> 
       <include name="jboss-saaj.jar"/> 
       <include name="wsdl4j.jar"/> -->
-      <include name="jbossmqha.jar"/>
       <include name="jmx-connector-client-factory.jar"/>
       <include name="namespace.jar"/>
       <include name="xmlsec.jar"/>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/build/pom.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -52,11 +52,6 @@
     
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-jbossmq</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-jmx</artifactId>
     </dependency>
     

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/testsuite/build.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -892,10 +892,6 @@
       <!-- JASPI needs revisiting -->
       <exclude name="org/jboss/test/web/test/JASPIFormAuthUnitTestCase.class"/>
    </patternset>
-	
-   <patternset id="jbossmq.excludes">
-    <exclude name="org/jboss/test/jbossmq/**"/>
-   </patternset>
 
    <patternset id="aop-with-classloader.excludes">
       <!-- Needs to be started either with the bootclasspath or -javaagent classloader hooks -->
@@ -923,7 +919,6 @@
       <patternset refid="deployment-service.excludes"/>
       <patternset refid="compatibility.excludes"/>
       <patternset refid="binding-manager.excludes"/>
-      <patternset refid="jbossmq.excludes"/>
       <patternset refid="profileservice.excludes"/>
       <patternset refid="profileservice.restart.excludes"/>
       <patternset refid="jbossmessaging.excludes"/>

Deleted: trunk/testsuite/imports/sections/jbossmq.xml
===================================================================
--- trunk/testsuite/imports/sections/jbossmq.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/testsuite/imports/sections/jbossmq.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -1,26 +0,0 @@
-<project name="tests-jbossmq-jars">
-   <!-- jbossmq test -->
-   <target name="_jars-jbossmq">
-      <mkdir dir="${build.lib}"/>
-      
-      <!-- build jbossmqtest.jar -->
-      <jar destfile="${build.lib}/jbossmqtest.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/jbossmq/**"/>
-         </fileset>
-      </jar>
-      
-      <copy tofile="${build.lib}/jbossmq-recovery-service.xml"
-         file="${build.resources}/jbossmq/jbossmq-recovery-service.xml"/>
-      
-      <copy tofile="${build.lib}/overridden-uil2-service.xml"
-         file="${build.resources}/jbossmq/overridden-uil2-service.xml"/>
-      
-      <copy tofile="${build.lib}/receivers-arraylist-service.xml"
-         file="${build.resources}/jbossmq/receivers-arraylist-service.xml"/>
-      
-      <copy tofile="${build.lib}/receivers-linkedlist-service.xml"
-         file="${build.resources}/jbossmq/receivers-linkedlist-service.xml"/>
-      
-   </target>
-</project>

Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/testsuite/imports/test-jars.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -36,7 +36,6 @@
    <import file="sections/isolation.xml"/>
    <import file="sections/jbossmessaging-cluster.xml"/>
    <import file="sections/jbossmessaging.xml"/>
-   <import file="sections/jbossmq.xml"/>
    <import file="sections/jbossmx.xml"/>
    <import file="sections/jbpm.xml"/>
    <import file="sections/jca.xml"/>
@@ -128,7 +127,6 @@
         _jars-isolation,
         _jars-jbossmessaging,
 	     _jars-jbossmessaging-cluster,
-        _jars-jbossmq,
         _jars-jbossmx,
         _jars-jbpm,
         _jars-jca,

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossMessagingJoramUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossMessagingJoramUnitTestCase.java	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossMessagingJoramUnitTestCase.java	2008-11-24 14:00:12 UTC (rev 81487)
@@ -24,7 +24,6 @@
 import junit.framework.Test;
 
 import org.jboss.test.AbstractTestDelegate;
-import org.jboss.test.jbossmq.test.JBossMQJoramUnitTestCase;
 
 /**
  * Joram unit tests

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2008-11-24 13:52:11 UTC (rev 81486)
+++ trunk/varia/pom.xml	2008-11-24 14:00:12 UTC (rev 81487)
@@ -130,11 +130,6 @@
     
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-jbossmq</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-j2se</artifactId>
     </dependency>
     




More information about the jboss-cvs-commits mailing list