cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r939722 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/
Date Fri, 30 Apr 2010 15:50:42 GMT
Author: sergeyb
Date: Fri Apr 30 15:50:42 2010
New Revision: 939722

URL: http://svn.apache.org/viewvc?rev=939722&view=rev
Log:
Merged revisions 939719 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r939719 | sergeyb | 2010-04-30 16:41:45 +0100 (Fri, 30 Apr 2010) | 1 line
  
  Renaming AbstactWSS4JSecurityContextProvidingInterceptor
........

Added:
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
      - copied unchanged from r939719, cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
Removed:
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JSecurityContextProvidingInterceptor.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 15:50:42 2010
@@ -1 +1 @@
-/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697
+/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697,939719

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java?rev=939722&r1=939721&r2=939722&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SimpleSubjectCreatingInterceptor.java
Fri Apr 30 15:50:42 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, 



Mime
View raw message