activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1080512 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/ test/resources/org/apache/activemq/security/
Date Fri, 11 Mar 2011 10:53:02 GMT
Author: gtully
Date: Fri Mar 11 10:53:02 2011
New Revision: 1080512

URL: http://svn.apache.org/viewvc?rev=1080512&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3183 - fix typo in useAuthenticatedPrincipalForJMSXUserID

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest-no-creds-only.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest.xml

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1080512&r1=1080511&r2=1080512&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Fri Mar 11 10:53:02 2011
@@ -114,7 +114,7 @@ public class BrokerService implements Se
     private boolean enableStatistics = true;
     private boolean persistent = true;
     private boolean populateJMSXUserID;
-    private boolean useAuthenticatedPrincipalForJMXUserID;
+    private boolean useAuthenticatedPrincipalForJMSXUserID;
 
     private boolean useShutdownHook = true;
     private boolean useLoggingForShutdownErrors;
@@ -1886,7 +1886,7 @@ public class BrokerService implements Se
         broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isPopulateJMSXUserID()) {
             UserIDBroker userIDBroker = new UserIDBroker(broker);
-            userIDBroker.setUseAuthenticatePrincipal(isUseAuthenticatedPrincipalForJMXUserID());
+            userIDBroker.setUseAuthenticatePrincipal(isUseAuthenticatedPrincipalForJMSXUserID());
             broker = userIDBroker;
         }
         if (isMonitorConnectionSplits()) {
@@ -2378,12 +2378,12 @@ public class BrokerService implements Se
         this.brokerId = new BrokerId(brokerId);
     }
 
-    public boolean isUseAuthenticatedPrincipalForJMXUserID() {
-        return useAuthenticatedPrincipalForJMXUserID;
+    public boolean isUseAuthenticatedPrincipalForJMSXUserID() {
+        return useAuthenticatedPrincipalForJMSXUserID;
     }
 
-    public void setUseAuthenticatedPrincipalForJMXUserID(boolean useAuthenticatedPrincipalForJMXUserID)
{
-        this.useAuthenticatedPrincipalForJMXUserID = useAuthenticatedPrincipalForJMXUserID;
+    public void setUseAuthenticatedPrincipalForJMSXUserID(boolean useAuthenticatedPrincipalForJMSXUserID)
{
+        this.useAuthenticatedPrincipalForJMSXUserID = useAuthenticatedPrincipalForJMSXUserID;
     }
 
     public boolean isNetworkConnectorStartAsync() {

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest-no-creds-only.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest-no-creds-only.xml?rev=1080512&r1=1080511&r2=1080512&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest-no-creds-only.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest-no-creds-only.xml
Fri Mar 11 10:53:02 2011
@@ -27,7 +27,7 @@
 
   <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core"
           populateJMSXUserID="true"
-          useAuthenticatedPrincipalForJMXUserID="true">
+          useAuthenticatedPrincipalForJMSXUserID="true">
 
     <plugins>
       <!--  use JAAS to authenticate using the login.config file on the classpath to configure
JAAS -->

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest.xml?rev=1080512&r1=1080511&r2=1080512&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker-guest.xml
Fri Mar 11 10:53:02 2011
@@ -27,7 +27,7 @@
 
   <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core"
           populateJMSXUserID="true"
-          useAuthenticatedPrincipalForJMXUserID="true">
+          useAuthenticatedPrincipalForJMSXUserID="true">
 
     <plugins>
       <!--  use JAAS to authenticate using the login.config file on the classpath to configure
JAAS -->



Mime
View raw message