User: pra
Date: 02/03/06 09:29:23
Modified: src/etc/conf/default jbossmq-service.xml jbossmq-state.xml
jbossmq-testsuite-service.xml
Log:
Configuration updated to support new security architecture
Revision Changes Path
1.20 +24 -6 jbossmq/src/etc/conf/default/jbossmq-service.xml
Index: jbossmq-service.xml
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/etc/conf/default/jbossmq-service.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jbossmq-service.xml 13 Feb 2002 04:17:06 -0000 1.19
+++ jbossmq-service.xml 6 Mar 2002 17:29:23 -0000 1.20
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: jbossmq-service.xml,v 1.19 2002/02/13 04:17:06 user57 Exp $ -->
+<!-- $Id: jbossmq-service.xml,v 1.20 2002/03/06 17:29:23 pra Exp $ -->
<server>
@@ -14,6 +14,16 @@
<depends
optional-attribute-name="StateManager">jboss.mq:service=StateManager</depends>
</mbean>
+ <mbean code="org.jboss.mq.server.JBossMQServiceAdapter"
+ name="jboss.mq:service=SecurityAdapter">
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="InvokerService">jboss.mq:service=SecurityManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.security.SecurityManager"
+ name="jboss.mq:service=SecurityManager">
+ </mbean>
+
<!--
| The MessageCache decides where to put JBossMQ message that
| are sitting around waiting to be consumed by a client.
@@ -43,7 +53,14 @@
| The StateManager is used to keep JMS persistent state data.
| For example: what durable subscriptions are active.
-->
- <mbean code="org.jboss.mq.server.StateManager"
+<!-- Old statemanager, may be used for compatibility
+ <mbean code="org.jboss.mq.sm.file.OldStateManager"
+ name="jboss.mq:service=OldStateManager">
+ <attribute name="StateFile">jbossmq-oldstate.xml</attribute>
+ </mbean>
+-->
+
+ <mbean code="org.jboss.mq.sm.file.DynamicStateManager"
name="jboss.mq:service=StateManager">
<!-- This file is pulled from the configuration URL of the server -->
<attribute name="StateFile">jbossmq-state.xml</attribute>
@@ -107,7 +124,7 @@
<mbean code="org.jboss.mq.il.jvm.JVMServerILService"
name="jboss.mq:service=InvocationLayer,type=JVM">
- <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=SecurityAdapter</depends>
<attribute name="ConnectionFactoryJNDIRef">java:/ConnectionFactory</attribute>
<attribute
name="XAConnectionFactoryJNDIRef">java:/XAConnectionFactory</attribute>
<attribute name="PingPeriod">0</attribute>
@@ -115,7 +132,7 @@
<mbean code="org.jboss.mq.il.rmi.RMIServerILService"
name="jboss.mq:service=InvocationLayer,type=RMI">
- <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=SecurityAdapter</depends>
<attribute name="ConnectionFactoryJNDIRef">RMIConnectionFactory</attribute>
<attribute name="XAConnectionFactoryJNDIRef">RMIXAConnectionFactory</attribute>
<attribute name="PingPeriod">60000</attribute>
@@ -123,7 +140,7 @@
<mbean code="org.jboss.mq.il.oil.OILServerILService"
name="jboss.mq:service=InvocationLayer,type=OIL">
- <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=SecurityAdapter</depends>
<attribute name="ConnectionFactoryJNDIRef">ConnectionFactory</attribute>
<attribute name="XAConnectionFactoryJNDIRef">XAConnectionFactory</attribute>
<attribute name="ServerBindPort">8090</attribute>
@@ -132,7 +149,7 @@
<mbean code="org.jboss.mq.il.uil.UILServerILService"
name="jboss.mq:service=InvocationLayer,type=UIL">
- <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=SecurityAdapter</depends>
<attribute name="ConnectionFactoryJNDIRef">UILConnectionFactory</attribute>
<attribute name="XAConnectionFactoryJNDIRef">UILXAConnectionFactory</attribute>
<attribute name="ServerBindPort">8091</attribute>
@@ -148,6 +165,7 @@
<mbean code="org.jboss.mq.server.QueueManager"
name="jboss.mq.destination:service=Queue,name=DLQ">
<depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
</mbean>
</server>
1.3 +41 -21 jbossmq/src/etc/conf/default/jbossmq-state.xml
Index: jbossmq-state.xml
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/etc/conf/default/jbossmq-state.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jbossmq-state.xml 13 Feb 2002 04:17:06 -0000 1.2
+++ jbossmq-state.xml 6 Mar 2002 17:29:23 -0000 1.3
@@ -1,24 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE StateManager>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBossMQ StateManager Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: jbossmq-state.xml,v 1.2 2002/02/13 04:17:06 user57 Exp $ -->
-
<StateManager>
- <User>
- <Name>guest</Name>
- <Password>guest</Password>
- </User>
-
- <User>
- <Name>john</Name>
- <Password>needle</Password>
- <Id>DurableSubscriberExample</Id>
- </User>
+ <Users>
+ <User>
+ <Name>john</Name>
+ <Password>needle</Password>
+ <Id>DurableSubscriberExample</Id>
+ </User>
+ <User>
+ <Name>guest</Name>
+ <Password>guest</Password>
+ </User>
+ <User>
+ <Name>nobody</Name>
+ <Password>nobody</Password>
+ </User>
+ <User>
+ <Name>dynsub</Name>
+ <Password>dynsub</Password>
+ </User>
+ </Users>
+ <Roles>
+ <Role name="guest">
+ <UserName>guest</UserName>
+ <UserName>john</UserName>
+ </Role>
+ <Role name="subscriber">
+ <UserName>john</UserName>
+ </Role>
+ <Role name="publisher">
+ <UserName>john</UserName>
+ <UserName>dynsub</UserName>
+ </Role>
+ <Role name="durpublisher">
+ <UserName>john</UserName>
+ <UserName>dynsub</UserName>
+ </Role>
+ <Role name="noacc">
+ <UserName>nobody</UserName>
+ </Role>
+ </Roles>
+ <DurableSubscriptions>
+ </DurableSubscriptions>
</StateManager>
-
1.2 +46 -2 jbossmq/src/etc/conf/default/jbossmq-testsuite-service.xml
Index: jbossmq-testsuite-service.xml
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/etc/conf/default/jbossmq-testsuite-service.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbossmq-testsuite-service.xml 13 Feb 2002 04:17:06 -0000 1.1
+++ jbossmq-testsuite-service.xml 6 Mar 2002 17:29:23 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: jbossmq-testsuite-service.xml,v 1.1 2002/02/13 04:17:06 user57 Exp $ -->
+<!-- $Id: jbossmq-testsuite-service.xml,v 1.2 2002/03/06 17:29:23 pra Exp $ -->
<!--
| This contains additional configuration required to run
@@ -8,14 +8,58 @@
-->
<server>
-
+ <!-- Destination without a configured SecurityManager or without a
+ a SecurityConf will default to role guest with read=true, write=true,
+ create=false.
+ -->
<mbean code="org.jboss.mq.server.TopicManager"
name="jboss.mq.destination:service=Topic,name=testTopic">
<depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ <attribute name="SecurityConf">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.TopicManager"
+ name="jboss.mq.destination:service=Topic,name=securedTopic">
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ <attribute name="SecurityConf">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
</mbean>
+
+ <mbean code="org.jboss.mq.server.TopicManager"
+ name="jboss.mq.destination:service=Topic,name=testDurableTopic">
+ <depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ <attribute name="SecurityConf">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
<mbean code="org.jboss.mq.server.QueueManager"
name="jboss.mq.destination:service=Queue,name=testQueue">
<depends
optional-attribute-name="JBossMQService">jboss.mq:service=Server</depends>
+ <depends
optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ <attribute name="SecurityConf">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
</mbean>
<mbean code="org.jboss.mq.server.QueueManager"
name="jboss.mq.destination:service=Queue,name=A">
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
