[jboss-cvs] JBossAS SVN: r93642 - in trunk: messaging/src/etc and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2009-09-17 08:49:45 -0400 (Thu, 17 Sep 2009)
New Revision: 93642

Added:
   trunk/messaging/src/etc/deployers/
   trunk/messaging/src/etc/deployers/messaging-definitions-jboss-beans.xml
Modified:
   trunk/build/build.xml
   trunk/messaging/src/etc/deploy/common/messaging-jboss-beans.xml
Log:
merge with 5_x branch: move messaging MODefinitions to deployers

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-09-17 12:25:56 UTC (rev 93641)
+++ trunk/build/build.xml	2009-09-17 12:49:45 UTC (rev 93642)
@@ -1116,7 +1116,21 @@
       </patternset>
       <mapper type="flatten"/>
     </unzip>
-    
+
+    <!-- 
+		The messaging profileservice definitions, to default and all
+  	-->
+	<copy todir="${install.default.deployers}">
+		<fileset dir="${messaging.module.output}/etc/deployers">
+			<include name="*-jboss-beans.xml"/>
+		</fileset>
+	</copy>
+  	<copy todir="${install.all.deployers}">
+  		<fileset dir="${messaging.module.output}/etc/deployers">
+			<include name="*-jboss-beans.xml"/>
+  		</fileset>
+  	</copy>
+  	
      <!--
           Default configuration
      -->
@@ -1127,6 +1141,7 @@
         <include name="*-jboss-beans.xml"/>
         <include name="jms-ds.xml"/>
       </fileset>
+    	
       <!--<fileset dir="${jboss.messaging.resources}/">
          <include name="connection-factories-service.xml"/>
          <include name="hsqldb-persistence-service.xml"/>

Modified: trunk/messaging/src/etc/deploy/common/messaging-jboss-beans.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-jboss-beans.xml	2009-09-17 12:25:56 UTC (rev 93641)
+++ trunk/messaging/src/etc/deploy/common/messaging-jboss-beans.xml	2009-09-17 12:49:45 UTC (rev 93642)
@@ -70,16 +70,4 @@
       <property name="destinationType">TopicTemplate</property>
    </bean>
 
-  <bean name="QueueMODefinition" class="org.jboss.jms.server.destination.QueueMODefinition">
-    <constructor>
-      <parameter><inject bean="ManagedObjectFactory" /></parameter>
-    </constructor>
-  </bean>
-
-  <bean name="TopicMODefinition" class="org.jboss.jms.server.destination.TopicMODefinition">
-    <constructor>
-      <parameter><inject bean="ManagedObjectFactory" /></parameter>
-    </constructor>
-  </bean>
-
 </deployment>

Added: trunk/messaging/src/etc/deployers/messaging-definitions-jboss-beans.xml
===================================================================
--- trunk/messaging/src/etc/deployers/messaging-definitions-jboss-beans.xml	                        (rev 0)
+++ trunk/messaging/src/etc/deployers/messaging-definitions-jboss-beans.xml	2009-09-17 12:49:45 UTC (rev 93642)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Mappings for jms destinations to managed objects
+	$Id:$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- MODefinition for the QueueService class -->
+  <bean name="QueueMODefinition" class="org.jboss.jms.server.destination.QueueMODefinition">
+    <constructor>
+      <parameter><inject bean="ManagedObjectFactory" /></parameter>
+    </constructor>
+  </bean>
+  <!-- MODefinition for the legacy Queue class -->
+  <bean name="LegacyQueueMODefinition" class="org.jboss.jms.server.destination.LegacyQueueMODefinition">
+    <constructor>
+      <parameter><inject bean="ManagedObjectFactory" /></parameter>
+    </constructor>
+  </bean>
+
+  <!-- MODefinition for the TopicService class -->
+  <bean name="TopicMODefinition" class="org.jboss.jms.server.destination.TopicMODefinition">
+    <constructor>
+      <parameter><inject bean="ManagedObjectFactory" /></parameter>
+    </constructor>
+  </bean>
+  <!-- MODefinition for the legacy Topic class -->
+  <bean name="LegacyTopicMODefinition" class="org.jboss.jms.server.destination.LegacyTopicMODefinition">
+    <constructor>
+      <parameter><inject bean="ManagedObjectFactory" /></parameter>
+    </constructor>
+  </bean>  
+
+  <!-- MODefinition for the ServerPeer class -->
+  <bean name="ServerPeerMODefinition" class="org.jboss.jms.server.ServerPeerMODefinition">
+    <constructor>
+      <parameter><inject bean="ManagedObjectFactory" /></parameter>
+    </constructor>
+  </bean>
+</deployment>
\ No newline at end of file