[jboss-cvs] JBoss Messaging SVN: r3550 - in branches/Branch_Stable/src/etc: xmdesc and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-01-09 01:49:58 -0500 (Wed, 09 Jan 2008)
New Revision: 3550

Modified:
   branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml
   branches/Branch_Stable/src/etc/xmdesc/ServerPeer-xmbean.xml
Log:
JBMESSAGING-1189, externalize the aop config name ans security config.

Modified: branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml	2008-01-09 06:47:54 UTC (rev 3549)
+++ branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml	2008-01-09 06:49:58 UTC (rev 3550)
@@ -8,10 +8,31 @@
 
 <server>
 
-   <!-- ServerPeer MBean configuration
-        ============================== -->
+   <!--  The SecurityStore mbean -->
+   <mbean code="org.jboss.jms.server.security.SecurityMetadataStore"
+             name="jboss.messaging:service=SecurityStore">
+             
+        <!-- The default security configuration to apply to destinations - this can be overridden on a per destination basis
+        -->
+        <attribute name="DefaultSecurityConfig">
+             <security>
+                  <role name="guest" read="true" write="true" create="true"/>
+             </security>
+        </attribute>
+        
+        <!-- The JAAS security domain to use for JBoss Messaging -->
+        <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
+        
+        <!--
+        The password used by the message sucker connections to create connections.
+        THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
+        -->
+        <attribute name="SuckerPassword">x</attribute>  
+   </mbean>
 
-   <mbean code="org.jboss.jms.server.ServerPeer"
+     <!-- ServerPeer MBean configuration
+          ============================== -->
+     <mbean code="org.jboss.jms.server.ServerPeer"
       name="jboss.messaging:service=ServerPeer"
       xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
 
@@ -29,18 +50,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="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 -->
       
@@ -100,7 +109,8 @@
       <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>

Modified: branches/Branch_Stable/src/etc/xmdesc/ServerPeer-xmbean.xml
===================================================================
--- branches/Branch_Stable/src/etc/xmdesc/ServerPeer-xmbean.xml	2008-01-09 06:47:54 UTC (rev 3549)
+++ branches/Branch_Stable/src/etc/xmdesc/ServerPeer-xmbean.xml	2008-01-09 06:49:58 UTC (rev 3550)
@@ -134,18 +134,12 @@
       <type>java.lang.String</type>
    </attribute>
 
-   <attribute access="read-write" getMethod="getSecurityDomain" setMethod="setSecurityDomain">
-      <description>The Security Domain to be used by the Server Peer</description>
-      <name>SecurityDomain</name>
-      <type>java.lang.String</type>
+   <attribute access="read-write" getMethod="getSecurityStore" setMethod="setSecurityStore">
+      <description>The SecurityStore implementation for the server.</description>
+      <name>SecurityStore</name>
+      <type>org.jboss.jms.server.SecurityStore</type>
    </attribute>
 
-   <attribute access="read-write" getMethod="getDefaultSecurityConfig" setMethod="setDefaultSecurityConfig">
-      <description>The Security config to use when the destination does not supply any</description>
-      <name>DefaultSecurityConfig</name>
-      <type>org.w3c.dom.Element</type>
-   </attribute>
-         
    <attribute access="read-write" getMethod="getDefaultMaxDeliveryAttempts" setMethod="setDefaultMaxDeliveryAttempts">
       <description>The default maximum delivery attempts for destinations, unless overridden on the destination</description>
       <name>DefaultMaxDeliveryAttempts</name>