svn commit: r447635 - in /incubator/activemq/trunk: activemq-core/src/main/java/org/apache/activemq/security/ activemq-jaas/src/main/java/org/apache/activemq/jaas/

[chirino]

Author: chirino
Date: Mon Sep 18 16:27:21 2006
New Revision: 447635

URL: http://svn.apache.org/viewvc?view=rev&rev=447635
Log:
https://issues.apache.org/activemq/browse/AMQ-912
Removed extra  
activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java
and renamed JassCredentialCallback.java to JassCredentialCallbackHandler.java 
since a Callback is very different from a CallbackHandler

Added:
    
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java
      - copied, changed from r447608, 
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallback.java
Removed:
    
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java
    
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallback.java
Modified:
    
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java

Modified: 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java?view=diff&rev=447635&r1=447634&r2=447635
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
 Mon Sep 18 16:27:21 2006
@@ -28,7 +28,7 @@
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ConnectionInfo;
 
-import org.apache.activemq.jaas.JassCredentialCallback;
+import org.apache.activemq.jaas.JassCredentialCallbackHandler;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 
@@ -72,7 +72,7 @@
             try {
                 // Do the login.
                 try {
-                    JassCredentialCallback callback = new 
JassCredentialCallback(info.getUserName(), info.getPassword());
+                    JassCredentialCallbackHandler callback = new 
JassCredentialCallbackHandler(info.getUserName(), info.getPassword());
                     LoginContext lc = new LoginContext(jassConfiguration, 
callback);
                     lc.login();
                     Subject subject = lc.getSubject();

Copied: 
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java
 (from r447608, 
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallback.java)
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java?view=diff&rev=447635&p1=incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallback.java&r1=447608&p2=incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java&r2=447635
==============================================================================
--- 
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallback.java
 (original)
+++ 
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java
 Mon Sep 18 16:27:21 2006
@@ -28,12 +28,12 @@
 /**
  * A JASS username password CallbackHandler.
  */
-public class JassCredentialCallback implements CallbackHandler {
+public class JassCredentialCallbackHandler implements CallbackHandler {
 
     private final String username;
     private final String password;
 
-    public JassCredentialCallback(String username, String password) {
+    public JassCredentialCallbackHandler(String username, String password) {
         this.username = username;
         this.password = password;
     }