[jboss-cvs] JBossAS SVN: r69267 - in trunk: messaging/src/etc/deploy/common and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-01-24 01:33:37 -0500 (Thu, 24 Jan 2008)
New Revision: 69267

Modified:
   trunk/build/build-thirdparty.xml
   trunk/messaging/src/etc/deploy/common/messaging-service.xml
Log:
Update to jbm 1.4.1.Beta1

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2008-01-24 06:14:22 UTC (rev 69266)
+++ trunk/build/build-thirdparty.xml	2008-01-24 06:33:37 UTC (rev 69267)
@@ -105,7 +105,7 @@
     <componentref name="jboss/jbossws-native50" version="snapshot"/>
     <componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
     <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
-    <componentref name="jboss/messaging" version="1.4.0.SP3a"/>
+    <componentref name="jboss/messaging" version="1.4.1.Beta1"/>
     <componentref name="jboss/metadata" version="1.0.0.Beta5"/>         
     <componentref name="jboss/microcontainer" version="snapshot"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>

Modified: trunk/messaging/src/etc/deploy/common/messaging-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-service.xml	2008-01-24 06:14:22 UTC (rev 69266)
+++ trunk/messaging/src/etc/deploy/common/messaging-service.xml	2008-01-24 06:33:37 UTC (rev 69267)
@@ -7,6 +7,19 @@
  -->
 
 <server>
+     <mbean code="org.jboss.jms.server.security.SecurityMetadataStore"
+          name="jboss.messaging:service=SecurityStore">
+          
+          <attribute name="DefaultSecurityConfig">
+               <security>
+                    <role name="guest" read="true" write="true" create="true"/>
+               </security>
+          </attribute>
+          
+          <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
+          
+          <attribute name="SuckerPassword">CHANGE ME!!</attribute>
+     </mbean>
 
    <!-- ServerPeer MBean configuration
         ============================== -->
@@ -29,20 +42,6 @@
 
 	  <attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
 	  
-	  <!-- The JAAS security domain to use for JBoss Messaging -->
-	  
-      <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
-      
-      <!-- The default security configuration to apply to destinations - this can be overridden on a per destination basis -->
-      
-      <attribute name="DefaultSecurityConfig">
-        <security>
-            <role name="Administrator" read="true" write="true" create="true"/>
-            <role name="Manager" read="true" write="true" create="true"/>
-            <role name="guest" read="true" write="true" create="true"/>
-        </security>
-      </attribute>
-      
       <!-- The default Dead Letter Queue (DLQ) to use for destinations.
            This can be overridden on a per destinatin basis -->
       
@@ -99,12 +98,20 @@
       <attribute name="SuckerPassword"></attribute>
       -->
 
+      <!-- The name of the server aspects configuration resource
+      <attribute name="ServerAopConfig">aop/jboss-aop-messaging-server.xml</attribute>
+      -->
+      <!-- The name of the client aspects configuration resource
+        <attribute name="ClientAopConfig">aop/jboss-aop-messaging-client.xml</attribute>
+      -->
+
       <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
       
       <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
       
       <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
-
+      <depends optional-attribute-name="SecurityStore"
+          proxy-type="org.jboss.jms.server.SecurityStore">jboss.messaging:service=SecurityStore</depends>
    </mbean>
 
 </server>