[hornetq-commits] JBoss hornetq SVN: r8714 - in trunk: examples/common/config and 93 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jan 5 11:25:53 EST 2010
Author: jmesnil
Date: 2010-01-05 11:25:50 -0500 (Tue, 05 Jan 2010)
New Revision: 8714
Added:
trunk/src/main/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java
trunk/src/main/org/hornetq/spi/core/security/JAASSecurityManager.java
Removed:
trunk/src/main/org/hornetq/core/security/impl/HornetQSecurityManagerImpl.java
trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java
Modified:
trunk/docs/user-manual/en/security.xml
trunk/docs/user-manual/en/using-server.xml
trunk/examples/common/config/hornetq-example-beans.xml
trunk/examples/core/microcontainer/server0/hornetq-beans.xml
trunk/examples/jms/applet/server0/hornetq-beans.xml
trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml
trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml
trunk/examples/jms/bridge/server0/hornetq-beans.xml
trunk/examples/jms/bridge/server1/hornetq-beans.xml
trunk/examples/jms/browser/server0/hornetq-beans.xml
trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml
trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml
trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml
trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml
trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml
trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml
trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml
trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml
trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml
trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml
trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml
trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml
trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml
trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml
trunk/examples/jms/dead-letter/server0/hornetq-beans.xml
trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml
trunk/examples/jms/divert/server0/hornetq-beans.xml
trunk/examples/jms/divert/server1/hornetq-beans.xml
trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml
trunk/examples/jms/expiry/server0/hornetq-beans.xml
trunk/examples/jms/http-transport/server0/hornetq-beans.xml
trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml
trunk/examples/jms/interceptor/server0/hornetq-beans.xml
trunk/examples/jms/jaas/server0/hornetq-beans.xml
trunk/examples/jms/jaas/src/org/hornetq/jms/example/ExampleLoginModule.java
trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml
trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml
trunk/examples/jms/jmx/server0/hornetq-beans.xml
trunk/examples/jms/large-message/server0/hornetq-beans.xml
trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml
trunk/examples/jms/management-notifications/server0/hornetq-beans.xml
trunk/examples/jms/management/server0/hornetq-beans.xml
trunk/examples/jms/message-counters/server0/hornetq-beans.xml
trunk/examples/jms/message-group/server0/hornetq-beans.xml
trunk/examples/jms/message-group2/server0/hornetq-beans.xml
trunk/examples/jms/message-priority/server0/hornetq-beans.xml
trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml
trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml
trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml
trunk/examples/jms/paging/server0/hornetq-beans.xml
trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml
trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml
trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml
trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml
trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml
trunk/examples/jms/queue-selector/server0/hornetq-beans.xml
trunk/examples/jms/queue/server0/hornetq-beans.xml
trunk/examples/jms/reattach-node/server0/hornetq-beans.xml
trunk/examples/jms/request-reply/server0/hornetq-beans.xml
trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml
trunk/examples/jms/security/server0/hornetq-beans.xml
trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml
trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml
trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml
trunk/examples/jms/static-selector/server0/hornetq-beans.xml
trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml
trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml
trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml
trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml
trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml
trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml
trunk/examples/jms/temp-queue/server0/hornetq-beans.xml
trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml
trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml
trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml
trunk/examples/jms/topic/server0/hornetq-beans.xml
trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml
trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml
trunk/examples/jms/transactional/server0/hornetq-beans.xml
trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml
trunk/examples/jms/xa-receive/server0/hornetq-beans.xml
trunk/examples/jms/xa-send/server0/hornetq-beans.xml
trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml
trunk/src/config/stand-alone/clustered/hornetq-beans.xml
trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml
trunk/src/config/trunk/clustered/hornetq-beans.xml
trunk/src/config/trunk/non-clustered/hornetq-beans.xml
trunk/src/main/org/hornetq/api/core/server/HornetQ.java
trunk/tests/jms-tests/config/hornetq-beans.xml
trunk/tests/jms-tests/config/test-beans.xml
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java
trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java
Log:
HORNETQ-258: Public vs. Private API
* moved security managers implementation to org.hornetq.spi.core.security
Modified: trunk/docs/user-manual/en/security.xml
===================================================================
--- trunk/docs/user-manual/en/security.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/docs/user-manual/en/security.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -191,12 +191,12 @@
<para>Let's take a look at a snippet from the default beans file:</para>
<programlisting>
<bean name="HornetQSecurityManager"
- class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
</programlisting>
- <para>The class <literal>org.hornetq.core.security.impl.HornetQSecurityManagerImpl</literal>
+ <para>The class <literal>org.hornetq.spi.core.security.HornetQSecurityManagerImpl</literal>
is the default security manager that reads used by the standalone server.</para>
<para>HornetQ ships with two other security manager implementations you can use
off-the-shelf; one a JAAS security manager and another for integrating with JBoss
Modified: trunk/docs/user-manual/en/using-server.xml
===================================================================
--- trunk/docs/user-manual/en/using-server.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/docs/user-manual/en/using-server.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -224,7 +224,7 @@
<!-- The security manager -->
<bean name="HornetQSecurityManager"
- class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/common/config/hornetq-example-beans.xml
===================================================================
--- trunk/examples/common/config/hornetq-example-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/common/config/hornetq-example-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
<!--<bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.JBossASSecurityManager"/>-->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
</bean>
<bean name="BasicSecurityDeployer" class="org.hornetq.core.deployers.impl.BasicUserCredentialsDeployer">
Modified: trunk/examples/core/microcontainer/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/core/microcontainer/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/core/microcontainer/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -12,7 +12,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/applet/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/applet/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/applet/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/bridge/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/bridge/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/bridge/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/bridge/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/bridge/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/bridge/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/browser/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/browser/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/browser/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/dead-letter/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/dead-letter/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/divert/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/divert/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/divert/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/divert/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/divert/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/divert/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/expiry/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/expiry/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/expiry/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/http-transport/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/http-transport/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/interceptor/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/interceptor/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/jaas/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/jaas/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/jaas/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager using JAAS -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.JAASSecurityManager">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.JAASSecurityManager">
<property name="configurationName">org.hornetq.jms.example.ExampleLoginModule</property>
<property name="configuration">
<inject bean="ExampleConfiguration"/>
Modified: trunk/examples/jms/jaas/src/org/hornetq/jms/example/ExampleLoginModule.java
===================================================================
--- trunk/examples/jms/jaas/src/org/hornetq/jms/example/ExampleLoginModule.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/jaas/src/org/hornetq/jms/example/ExampleLoginModule.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -27,7 +27,7 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.hornetq.core.security.impl.JAASSecurityManager;
+import org.hornetq.spi.core.security.JAASSecurityManager;
/**
* A ExampleLoginModule
Modified: trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -31,7 +31,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -31,7 +31,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/jmx/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/jmx/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/jmx/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/large-message/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/large-message/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/large-message/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/management/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/management/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/management/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/management-notifications/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/management-notifications/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/message-counters/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/message-counters/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/message-group/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/message-group/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/message-group/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/message-group2/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/message-group2/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/message-group2/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/message-priority/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/message-priority/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/paging/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/paging/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/paging/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/queue/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/queue/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/queue/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/queue-selector/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/queue-selector/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/reattach-node/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/reattach-node/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/reattach-node/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/request-reply/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/request-reply/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/security/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/security/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/static-selector/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/static-selector/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/temp-queue/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/temp-queue/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/topic/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/topic/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/topic/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/transactional/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/transactional/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/transactional/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/xa-receive/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/xa-receive/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/xa-send/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/xa-send/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/src/config/stand-alone/clustered/hornetq-beans.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/config/stand-alone/clustered/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
</bean>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
</bean>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/src/config/trunk/clustered/hornetq-beans.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/config/trunk/clustered/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
</bean>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/src/config/trunk/non-clustered/hornetq-beans.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/config/trunk/non-clustered/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
</bean>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/src/main/org/hornetq/api/core/server/HornetQ.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/server/HornetQ.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/main/org/hornetq/api/core/server/HornetQ.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -19,10 +19,10 @@
import org.hornetq.api.core.config.Configuration;
import org.hornetq.core.logging.Logger;
-import org.hornetq.core.security.impl.HornetQSecurityManagerImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.impl.HornetQServerImpl;
import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
/**
* A HornetQ
Deleted: trunk/src/main/org/hornetq/core/security/impl/HornetQSecurityManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/security/impl/HornetQSecurityManagerImpl.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/main/org/hornetq/core/security/impl/HornetQSecurityManagerImpl.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -1,215 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.core.security.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.security.CheckType;
-import org.hornetq.core.security.Role;
-import org.hornetq.spi.core.security.HornetQSecurityManager;
-
-/**
- * A basic implementation of the HornetQSecurityManager. This can be used within an appserver and be deployed by
- * BasicUserCredentialsDeployer or used standalone or embedded.
- *
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- */
-public class HornetQSecurityManagerImpl implements HornetQSecurityManager
-{
- private static final Logger log = Logger.getLogger(HornetQSecurityManagerImpl.class);
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- /**
- * the current valid users
- */
- private final Map<String, User> users = new HashMap<String, User>();
-
- private String defaultUser = null;
-
- /**
- * the roles for the users
- */
- private final Map<String, List<String>> roles = new HashMap<String, List<String>>();
-
- // HornetQComponent implementation ------------------------------------------
-
- public void start()
- {
- }
-
- public void stop()
- {
- users.clear();
-
- roles.clear();
-
- defaultUser = null;
- }
-
- public boolean isStarted()
- {
- return true;
- }
-
- // Public ---------------------------------------------------------------------
-
- public boolean validateUser(final String user, final String password)
- {
- if (user == null && defaultUser == null)
- {
- return false;
- }
-
- User theUser = users.get(user == null ? defaultUser : user);
-
- boolean ok = theUser != null && theUser.isValid(user == null ? defaultUser : user, password == null ? defaultUser
- : password);
- return ok;
- }
-
- public boolean validateUserAndRole(final String user,
- final String password,
- final Set<Role> roles,
- final CheckType checkType)
- {
- if (validateUser(user, password))
- {
- List<String> availableRoles = this.roles.get(user == null ? defaultUser : user);
-
- if (availableRoles == null)
- {
- return false;
- }
-
- for (String availableRole : availableRoles)
- {
- if (roles != null)
- {
- for (Role role : roles)
- {
- if (role.getName().equals(availableRole) && checkType.hasRole(role))
- {
- return true;
- }
- }
- }
- }
- }
-
- return false;
- }
-
- public void addUser(final String user, final String password)
- {
- if (user == null)
- {
- throw new IllegalArgumentException("User cannot be null");
- }
- if (password == null)
- {
- throw new IllegalArgumentException("password cannot be null");
- }
- users.put(user, new User(user, password));
- }
-
- public void removeUser(final String user)
- {
- users.remove(user);
- roles.remove(user);
- }
-
- public void addRole(final String user, final String role)
- {
- if (roles.get(user) == null)
- {
- roles.put(user, new ArrayList<String>());
- }
- roles.get(user).add(role);
- }
-
- public void removeRole(final String user, final String role)
- {
- if (roles.get(user) == null)
- {
- return;
- }
- roles.get(user).remove(role);
- }
-
- /*
- * set the default user for null users
- */
- public void setDefaultUser(final String username)
- {
- defaultUser = username;
- }
-
- static class User
- {
- final String user;
-
- final String password;
-
- User(final String user, final String password)
- {
- this.user = user;
- this.password = password;
- }
-
- @Override
- public boolean equals(final Object o)
- {
- if (this == o)
- {
- return true;
- }
- if (o == null || getClass() != o.getClass())
- {
- return false;
- }
-
- User user1 = (User)o;
-
- if (!user.equals(user1.user))
- {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- return user.hashCode();
- }
-
- public boolean isValid(final String user, final String password)
- {
- if (user == null)
- {
- return false;
- }
- return this.user.equals(user) && this.password.equals(password);
- }
- }
-}
Deleted: trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -1,308 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.core.security.impl;
-
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.security.CheckType;
-import org.hornetq.core.security.Role;
-import org.hornetq.core.server.HornetQComponent;
-import org.hornetq.spi.core.security.HornetQSecurityManager;
-
-/**
- * This implementation delegates to the JAAS security interfaces.
- *
- * The {@link Subject} returned by the login context is expecting to have a {@link Group} with the <code>Roles</code> name
- * containing a set of {@link Principal} for each role of the user.
- *
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
- */
-public class JAASSecurityManager implements HornetQSecurityManager, HornetQComponent
-{
- private static final Logger log = Logger.getLogger(JAASSecurityManager.class);
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private final boolean trace = JAASSecurityManager.log.isTraceEnabled();
-
- private String configurationName;
-
- private boolean started;
-
- private CallbackHandler callbackHandler;
-
- private Configuration config;
-
- // HornetQSecurityManager implementation -----------------------------
-
- public boolean validateUser(final String user, final String password)
- {
- try
- {
- getAuthenticatedSubject(user, password);
- return true;
- }
- catch (LoginException e1)
- {
- return false;
- }
- }
-
- public boolean validateUserAndRole(final String user,
- final String password,
- final Set<Role> roles,
- final CheckType checkType)
- {
- Subject localSubject = null;
- try
- {
- localSubject = getAuthenticatedSubject(user, password);
- }
- catch (LoginException e1)
- {
- return false;
- }
-
- boolean authenticated = true;
-
- if (localSubject != null)
- {
- Set<Principal> rolePrincipals = getRolePrincipals(checkType, roles);
-
- // authenticated = realmMapping.doesUserHaveRole(principal, rolePrincipals);
-
- boolean hasRole = false;
- // check that the caller is authenticated to the current thread
-
- // Check the caller's roles
- Group subjectRoles = getSubjectRoles(localSubject);
- if (subjectRoles != null)
- {
- Iterator<Principal> iter = rolePrincipals.iterator();
- while (!hasRole && iter.hasNext())
- {
- Principal role = iter.next();
- hasRole = subjectRoles.isMember(role);
- }
- }
-
- authenticated = hasRole;
-
- if (trace)
- {
- JAASSecurityManager.log.trace("user " + user + (authenticated ? " is " : " is NOT ") + "authorized");
- }
- }
- return authenticated;
- }
-
- public void addRole(final String user, final String role)
- {
- // NO-OP
- }
-
- public void addUser(final String user, final String password)
- {
- // NO-OP
- }
-
- public void removeRole(final String user, final String role)
- {
- // NO-OP
- }
-
- public void removeUser(final String user)
- {
- // NO-OP
- }
-
- public void setDefaultUser(final String username)
- {
- // NO-OP
- }
-
- // HornetQComponent implementation -----------------------------
-
- /**
- * lifecycle method, needs to be called
- *
- * @throws Exception
- */
- public synchronized void start() throws Exception
- {
- if (started)
- {
- return;
- }
-
- started = true;
- }
-
- public synchronized void stop()
- {
- if (!started)
- {
- return;
- }
- started = false;
- }
-
- public synchronized boolean isStarted()
- {
- return started;
- }
-
- private Subject getAuthenticatedSubject(final String user, final String password) throws LoginException
- {
- SimplePrincipal principal = user == null ? null : new SimplePrincipal(user);
-
- char[] passwordChars = null;
-
- if (password != null)
- {
- passwordChars = password.toCharArray();
- }
-
- Subject subject = new Subject();
-
- if (user != null)
- {
- subject.getPrincipals().add(principal);
- }
- subject.getPrivateCredentials().add(passwordChars);
-
- LoginContext lc = new LoginContext(configurationName, subject, callbackHandler, config);
- lc.login();
- return lc.getSubject();
- }
-
- private Group getSubjectRoles(final Subject subject)
- {
- Set<Group> subjectGroups = subject.getPrincipals(Group.class);
- Iterator<Group> iter = subjectGroups.iterator();
- Group roles = null;
- while (iter.hasNext())
- {
- Group grp = iter.next();
- String name = grp.getName();
- if (name.equals("Roles"))
- {
- roles = grp;
- }
- }
- return roles;
- }
-
- private Set<Principal> getRolePrincipals(final CheckType checkType, final Set<Role> roles)
- {
- Set<Principal> principals = new HashSet<Principal>();
- for (Role role : roles)
- {
- if (checkType.hasRole(role))
- {
- principals.add(new SimplePrincipal(role.getName()));
- }
- }
- return principals;
- }
-
- // Public --------------------------------------------------------
-
- public void setConfigurationName(final String configurationName)
- {
- this.configurationName = configurationName;
- }
-
- public void setCallbackHandler(final CallbackHandler handler)
- {
- callbackHandler = handler;
- }
-
- public void setConfiguration(final Configuration config)
- {
- this.config = config;
- }
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
- public static class SimplePrincipal implements Principal, java.io.Serializable
- {
- private static final long serialVersionUID = 1L;
-
- private final String name;
-
- public SimplePrincipal(final String name)
- {
- this.name = name;
- }
-
- /** Compare this SimplePrincipal's name against another Principal
- @return true if name equals another.getName();
- */
- @Override
- public boolean equals(final Object another)
- {
- if (!(another instanceof Principal))
- {
- return false;
- }
- String anotherName = ((Principal)another).getName();
- boolean equals = false;
- if (name == null)
- {
- equals = anotherName == null;
- }
- else
- {
- equals = name.equals(anotherName);
- }
- return equals;
- }
-
- @Override
- public int hashCode()
- {
- return name == null ? 0 : name.hashCode();
- }
-
- @Override
- public String toString()
- {
- return name;
- }
-
- public String getName()
- {
- return name;
- }
- }
-
-}
Copied: trunk/src/main/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java (from rev 8713, trunk/src/main/org/hornetq/core/security/impl/HornetQSecurityManagerImpl.java)
===================================================================
--- trunk/src/main/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java (rev 0)
+++ trunk/src/main/org/hornetq/spi/core/security/HornetQSecurityManagerImpl.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.spi.core.security;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.security.CheckType;
+import org.hornetq.core.security.Role;
+
+/**
+ * A basic implementation of the HornetQSecurityManager. This can be used within an appserver and be deployed by
+ * BasicUserCredentialsDeployer or used standalone or embedded.
+ *
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class HornetQSecurityManagerImpl implements HornetQSecurityManager
+{
+ private static final Logger log = Logger.getLogger(HornetQSecurityManagerImpl.class);
+
+ // Static --------------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ /**
+ * the current valid users
+ */
+ private final Map<String, User> users = new HashMap<String, User>();
+
+ private String defaultUser = null;
+
+ /**
+ * the roles for the users
+ */
+ private final Map<String, List<String>> roles = new HashMap<String, List<String>>();
+
+ // HornetQComponent implementation ------------------------------------------
+
+ public void start()
+ {
+ }
+
+ public void stop()
+ {
+ users.clear();
+
+ roles.clear();
+
+ defaultUser = null;
+ }
+
+ public boolean isStarted()
+ {
+ return true;
+ }
+
+ // Public ---------------------------------------------------------------------
+
+ public boolean validateUser(final String user, final String password)
+ {
+ if (user == null && defaultUser == null)
+ {
+ return false;
+ }
+
+ User theUser = users.get(user == null ? defaultUser : user);
+
+ boolean ok = theUser != null && theUser.isValid(user == null ? defaultUser : user, password == null ? defaultUser
+ : password);
+ return ok;
+ }
+
+ public boolean validateUserAndRole(final String user,
+ final String password,
+ final Set<Role> roles,
+ final CheckType checkType)
+ {
+ if (validateUser(user, password))
+ {
+ List<String> availableRoles = this.roles.get(user == null ? defaultUser : user);
+
+ if (availableRoles == null)
+ {
+ return false;
+ }
+
+ for (String availableRole : availableRoles)
+ {
+ if (roles != null)
+ {
+ for (Role role : roles)
+ {
+ if (role.getName().equals(availableRole) && checkType.hasRole(role))
+ {
+ return true;
+ }
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public void addUser(final String user, final String password)
+ {
+ if (user == null)
+ {
+ throw new IllegalArgumentException("User cannot be null");
+ }
+ if (password == null)
+ {
+ throw new IllegalArgumentException("password cannot be null");
+ }
+ users.put(user, new User(user, password));
+ }
+
+ public void removeUser(final String user)
+ {
+ users.remove(user);
+ roles.remove(user);
+ }
+
+ public void addRole(final String user, final String role)
+ {
+ if (roles.get(user) == null)
+ {
+ roles.put(user, new ArrayList<String>());
+ }
+ roles.get(user).add(role);
+ }
+
+ public void removeRole(final String user, final String role)
+ {
+ if (roles.get(user) == null)
+ {
+ return;
+ }
+ roles.get(user).remove(role);
+ }
+
+ /*
+ * set the default user for null users
+ */
+ public void setDefaultUser(final String username)
+ {
+ defaultUser = username;
+ }
+
+ static class User
+ {
+ final String user;
+
+ final String password;
+
+ User(final String user, final String password)
+ {
+ this.user = user;
+ this.password = password;
+ }
+
+ @Override
+ public boolean equals(final Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ User user1 = (User)o;
+
+ if (!user.equals(user1.user))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return user.hashCode();
+ }
+
+ public boolean isValid(final String user, final String password)
+ {
+ if (user == null)
+ {
+ return false;
+ }
+ return this.user.equals(user) && this.password.equals(password);
+ }
+ }
+}
Copied: trunk/src/main/org/hornetq/spi/core/security/JAASSecurityManager.java (from rev 8713, trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java)
===================================================================
--- trunk/src/main/org/hornetq/spi/core/security/JAASSecurityManager.java (rev 0)
+++ trunk/src/main/org/hornetq/spi/core/security/JAASSecurityManager.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.spi.core.security;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.security.CheckType;
+import org.hornetq.core.security.Role;
+import org.hornetq.core.server.HornetQComponent;
+
+/**
+ * This implementation delegates to the JAAS security interfaces.
+ *
+ * The {@link Subject} returned by the login context is expecting to have a {@link Group} with the <code>Roles</code> name
+ * containing a set of {@link Principal} for each role of the user.
+ *
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ * @author <a href="tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ */
+public class JAASSecurityManager implements HornetQSecurityManager, HornetQComponent
+{
+ private static final Logger log = Logger.getLogger(JAASSecurityManager.class);
+
+ // Static --------------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private final boolean trace = JAASSecurityManager.log.isTraceEnabled();
+
+ private String configurationName;
+
+ private boolean started;
+
+ private CallbackHandler callbackHandler;
+
+ private Configuration config;
+
+ // HornetQSecurityManager implementation -----------------------------
+
+ public boolean validateUser(final String user, final String password)
+ {
+ try
+ {
+ getAuthenticatedSubject(user, password);
+ return true;
+ }
+ catch (LoginException e1)
+ {
+ return false;
+ }
+ }
+
+ public boolean validateUserAndRole(final String user,
+ final String password,
+ final Set<Role> roles,
+ final CheckType checkType)
+ {
+ Subject localSubject = null;
+ try
+ {
+ localSubject = getAuthenticatedSubject(user, password);
+ }
+ catch (LoginException e1)
+ {
+ return false;
+ }
+
+ boolean authenticated = true;
+
+ if (localSubject != null)
+ {
+ Set<Principal> rolePrincipals = getRolePrincipals(checkType, roles);
+
+ // authenticated = realmMapping.doesUserHaveRole(principal, rolePrincipals);
+
+ boolean hasRole = false;
+ // check that the caller is authenticated to the current thread
+
+ // Check the caller's roles
+ Group subjectRoles = getSubjectRoles(localSubject);
+ if (subjectRoles != null)
+ {
+ Iterator<Principal> iter = rolePrincipals.iterator();
+ while (!hasRole && iter.hasNext())
+ {
+ Principal role = iter.next();
+ hasRole = subjectRoles.isMember(role);
+ }
+ }
+
+ authenticated = hasRole;
+
+ if (trace)
+ {
+ JAASSecurityManager.log.trace("user " + user + (authenticated ? " is " : " is NOT ") + "authorized");
+ }
+ }
+ return authenticated;
+ }
+
+ public void addRole(final String user, final String role)
+ {
+ // NO-OP
+ }
+
+ public void addUser(final String user, final String password)
+ {
+ // NO-OP
+ }
+
+ public void removeRole(final String user, final String role)
+ {
+ // NO-OP
+ }
+
+ public void removeUser(final String user)
+ {
+ // NO-OP
+ }
+
+ public void setDefaultUser(final String username)
+ {
+ // NO-OP
+ }
+
+ // HornetQComponent implementation -----------------------------
+
+ /**
+ * lifecycle method, needs to be called
+ *
+ * @throws Exception
+ */
+ public synchronized void start() throws Exception
+ {
+ if (started)
+ {
+ return;
+ }
+
+ started = true;
+ }
+
+ public synchronized void stop()
+ {
+ if (!started)
+ {
+ return;
+ }
+ started = false;
+ }
+
+ public synchronized boolean isStarted()
+ {
+ return started;
+ }
+
+ private Subject getAuthenticatedSubject(final String user, final String password) throws LoginException
+ {
+ SimplePrincipal principal = user == null ? null : new SimplePrincipal(user);
+
+ char[] passwordChars = null;
+
+ if (password != null)
+ {
+ passwordChars = password.toCharArray();
+ }
+
+ Subject subject = new Subject();
+
+ if (user != null)
+ {
+ subject.getPrincipals().add(principal);
+ }
+ subject.getPrivateCredentials().add(passwordChars);
+
+ LoginContext lc = new LoginContext(configurationName, subject, callbackHandler, config);
+ lc.login();
+ return lc.getSubject();
+ }
+
+ private Group getSubjectRoles(final Subject subject)
+ {
+ Set<Group> subjectGroups = subject.getPrincipals(Group.class);
+ Iterator<Group> iter = subjectGroups.iterator();
+ Group roles = null;
+ while (iter.hasNext())
+ {
+ Group grp = iter.next();
+ String name = grp.getName();
+ if (name.equals("Roles"))
+ {
+ roles = grp;
+ }
+ }
+ return roles;
+ }
+
+ private Set<Principal> getRolePrincipals(final CheckType checkType, final Set<Role> roles)
+ {
+ Set<Principal> principals = new HashSet<Principal>();
+ for (Role role : roles)
+ {
+ if (checkType.hasRole(role))
+ {
+ principals.add(new SimplePrincipal(role.getName()));
+ }
+ }
+ return principals;
+ }
+
+ // Public --------------------------------------------------------
+
+ public void setConfigurationName(final String configurationName)
+ {
+ this.configurationName = configurationName;
+ }
+
+ public void setCallbackHandler(final CallbackHandler handler)
+ {
+ callbackHandler = handler;
+ }
+
+ public void setConfiguration(final Configuration config)
+ {
+ this.config = config;
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+ public static class SimplePrincipal implements Principal, java.io.Serializable
+ {
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ public SimplePrincipal(final String name)
+ {
+ this.name = name;
+ }
+
+ /** Compare this SimplePrincipal's name against another Principal
+ @return true if name equals another.getName();
+ */
+ @Override
+ public boolean equals(final Object another)
+ {
+ if (!(another instanceof Principal))
+ {
+ return false;
+ }
+ String anotherName = ((Principal)another).getName();
+ boolean equals = false;
+ if (name == null)
+ {
+ equals = anotherName == null;
+ }
+ else
+ {
+ equals = name.equals(anotherName);
+ }
+ return equals;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return name == null ? 0 : name.hashCode();
+ }
+
+ @Override
+ public String toString()
+ {
+ return name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+ }
+
+}
Modified: trunk/tests/jms-tests/config/hornetq-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/jms-tests/config/hornetq-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
</bean>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/tests/jms-tests/config/test-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/test-beans.xml 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/jms-tests/config/test-beans.xml 2010-01-05 16:25:50 UTC (rev 8714)
@@ -26,7 +26,7 @@
</bean>
<!-- The security manager -->
- <bean name="HornetQSecurityManager" class="org.hornetq.core.security.impl.HornetQSecurityManagerImpl">
+ <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
<start ignored="true"/>
<stop ignored="true"/>
</bean>
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -28,11 +28,11 @@
import org.hornetq.api.jms.server.JMSServerManager;
import org.hornetq.api.jms.server.JMSServerManagerImpl;
import org.hornetq.core.logging.Logger;
-import org.hornetq.core.security.impl.HornetQSecurityManagerImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.impl.HornetQServerImpl;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
import org.hornetq.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -21,9 +21,9 @@
import org.hornetq.api.core.server.HornetQ;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.security.Role;
-import org.hornetq.core.security.impl.HornetQSecurityManagerImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.HierarchicalRepository;
+import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
/**
* A SecurityManagementTest
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -37,11 +37,11 @@
import org.hornetq.core.paging.impl.PagingManagerImpl;
import org.hornetq.core.paging.impl.PagingStoreFactoryNIO;
import org.hornetq.core.paging.impl.PagingStoreImpl;
-import org.hornetq.core.security.impl.HornetQSecurityManagerImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.impl.HornetQServerImpl;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.OrderedExecutorFactory;
Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -40,11 +40,11 @@
import org.hornetq.api.core.config.Configuration;
import org.hornetq.api.core.exception.HornetQException;
import org.hornetq.core.security.Role;
-import org.hornetq.core.security.impl.JAASSecurityManager;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.hornetq.spi.core.security.JAASSecurityManager;
import org.hornetq.tests.util.ServiceTestBase;
import org.jboss.security.SimpleGroup;
Modified: trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -19,7 +19,7 @@
import org.hornetq.core.security.CheckType;
import org.hornetq.core.security.Role;
-import org.hornetq.core.security.impl.HornetQSecurityManagerImpl;
+import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
import org.hornetq.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2010-01-05 16:16:02 UTC (rev 8713)
+++ trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2010-01-05 16:25:50 UTC (rev 8714)
@@ -36,7 +36,7 @@
import org.hornetq.core.security.CheckType;
import org.hornetq.core.security.Role;
-import org.hornetq.core.security.impl.JAASSecurityManager;
+import org.hornetq.spi.core.security.JAASSecurityManager;
import org.hornetq.tests.util.UnitTestCase;
import org.jboss.security.SimpleGroup;
More information about the hornetq-commits
mailing list