svn commit: r939719 - in /cxf/trunk/rt/ws/security/src: main/java/org/apache/cxf/ws/security/wss4j/ test/java/org/apache/cxf/ws/security/wss4j/

[sergeyb]

Author: sergeyb
Date: Fri Apr 30 15:41:45 2010
New Revision: 939719

URL: http://svn.apache.org/viewvc?rev=939719&view=rev
Log:
Renaming AbstactWSS4JSecurityContextProvidingInterceptor

Added:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
      - copied, changed from r939374, 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JSecurityContextProvidingInterceptor.java
Removed:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JSecurityContextProvidingInterceptor.java
Modified:
    
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java

Copied: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
 (from r939374, 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JSecurityContextProvidingInterceptor.java)
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java?p2=cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java&p1=cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JSecurityContextProvidingInterceptor.java&r1=939374&r2=939719&rev=939719&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JSecurityContextProvidingInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
 Fri Apr 30 15:41:45 2010
@@ -69,19 +69,19 @@ import org.apache.ws.security.processor.
  * an application is expected to provide a password callback handler for 
decrypting the token only.     
  *
  */
-public abstract class AbstractWSS4JSecurityContextProvidingInterceptor extends 
WSS4JInInterceptor 
+public abstract class AbstractUsernameTokenAuthenticatingInterceptor extends 
WSS4JInInterceptor 
     implements Processor {
     
     private static final Logger LOG = 
-        
LogUtils.getL7dLogger(AbstractWSS4JSecurityContextProvidingInterceptor.class);
+        
LogUtils.getL7dLogger(AbstractUsernameTokenAuthenticatingInterceptor.class);
     
     private boolean supportDigestPasswords;
     
-    public AbstractWSS4JSecurityContextProvidingInterceptor() {
+    public AbstractUsernameTokenAuthenticatingInterceptor() {
         super();
     }
     
-    public AbstractWSS4JSecurityContextProvidingInterceptor(Map<String, 
Object> properties) {
+    public AbstractUsernameTokenAuthenticatingInterceptor(Map<String, Object> 
properties) {
         super(properties);
     }
     
@@ -216,7 +216,7 @@ public abstract class AbstractWSS4JSecur
                     WSPasswordCallback pc = (WSPasswordCallback)c;
                     if (WSConstants.PASSWORD_TEXT.equals(pc.getPasswordType()) 
                         && pc.getUsage() == 
WSPasswordCallback.USERNAME_TOKEN_UNKNOWN) {
-                        
AbstractWSS4JSecurityContextProvidingInterceptor.this.setSubject(
+                        
AbstractUsernameTokenAuthenticatingInterceptor.this.setSubject(
                             pc.getIdentifier(), pc.getPassword(), false, null, 
null);
                     } else if (pwdHandler != null) {
                         pwdHandler.handle(callbacks);
@@ -270,7 +270,7 @@ public abstract class AbstractWSS4JSecur
                 LOG.fine("UsernameToken password " + password);
             }
             
-            AbstractWSS4JSecurityContextProvidingInterceptor.this.setSubject(
+            AbstractUsernameTokenAuthenticatingInterceptor.this.setSubject(
                 user, password, ut.isHashed(), nonce, createdTime);    
             
             WSUsernameTokenPrincipal principal = new 
WSUsernameTokenPrincipal(user, ut.isHashed());

Modified: 
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java?rev=939719&r1=939718&r2=939719&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java
 Fri Apr 30 15:41:45 2010
@@ -23,7 +23,7 @@ import javax.security.auth.Subject;
 import org.apache.cxf.common.security.SimpleGroup;
 import org.apache.cxf.common.security.SimplePrincipal;
 
-public class SimpleSubjectCreatingInterceptor extends 
AbstractWSS4JSecurityContextProvidingInterceptor {
+public class SimpleSubjectCreatingInterceptor extends 
AbstractUsernameTokenAuthenticatingInterceptor {
 
     @Override
     protected Subject createSubject(String name,