dims        2005/06/01 03:54:50

  Modified:    wss4j    build.xml
               wss4j/src/org/apache/ws/axis/security/conversation
                        ConversationClientHandler.java
               wss4j/src/org/apache/ws/axis/security/trust STSAgent.java
               wss4j/src/org/apache/ws/axis/security/trust/secconv/interop
                        InteropHandshaker.java SAML2SCTIssuer.java
                        SAML2SCTRequester.java UNT2SAMLIssuer.java
                        UNT2SAMLRequester.java
               wss4j/src/org/apache/ws/security/conversation
                        ConversationConstants.java ConversationEngine.java
                        KeyDerivator.java
               wss4j/src/org/apache/ws/security/conversation/dkAlgo
                        AlgoFactory.java DerivationAlgorithm.java
                        P_SHA1.java
               wss4j/src/org/apache/ws/security/conversation/message/info
                        SecurityContextInfo.java
               wss4j/src/org/apache/ws/security/conversation/message/token
                        DerivedKeyToken.java
               wss4j/src/org/apache/ws/security/policy/message/token
                        AppliesTo.java
               wss4j/src/org/apache/ws/security/trust RequestResolver.java
                        TrustConstants.java WSTrustException.java
               wss4j/src/org/apache/ws/security/trust/issue
                        X509ToSCTIssuer.java
               wss4j/src/org/apache/ws/security/trust/message/token
                        AllowPostdating.java BaseToken.java
                        BinarySecret.java Code.java ComputedKey.java
                        Entropy.java KeySize.java LifeTime.java Reason.java
                        Renewing.java RequestType.java Status.java
                        TokenType.java
               wss4j/test/secconv/components TestRSTR.java
               wss4j/test/secconv/scenarios build.xml
               wss4j/test/secconv/scenarios/ping/impl deploy.wsdd
  Added:       wss4j/src/org/apache/ws/security/trust RSTRParser.java
                        errors.properties
               wss4j/src/org/apache/ws/security/trust/message/token
                        AbstractToken.java Claims.java RenewTarget.java
                        RequestSecurityToken.java
                        RequestSecurityTokenResponse.java
                        RequestedProofToken.java
                        RequestedSecurityToken.java
               wss4j/test/secconv/scenarios/ping/impl PingBindingStub.java
                        PingPort.java PingService.java
                        PingServiceLocator.java TicketType.java
                        undeploy.wsdd
  Removed:     wss4j/src/org/apache/ws/security/conversation/message/token
                        RequestSecurityToken.java
                        RequestSecurityTokenResponse.java
                        RequestedProofToken.java
                        RequestedSecurityToken.java
               wss4j/src/org/apache/ws/security/trust RSTR_Parser.java
                        STSManager2.java
  Log:
  Fix for I refactored the org.apache.ws.security.trust.message.token.* classes
  of the WS-Trust impl from Ruchith.
  
  Changes:
  * RequestSecurityToken, RequestSecurityTokenResponse,
  RequestedProofToken, RequestedSecurityToken were moved into the Trust
  Impl. where they actually belong.
  * All the WS-Trust related security token classes extends from AbstractToken
   Removed the unnecessary methods from these classes and added missing ones
  * Added a few missing tokens: RenewTarget, Claims
  
  Note: secconv/components/PackageTests is failing and i had to comment it in 
build.xml
  
  Revision  Changes    Path
  1.22      +1 -1      ws-fx/wss4j/build.xml
  
  http://cvs.apache.org/viewcvs/ws-fx/wss4j/build.xml.diff?r1=1.21&r2=1.22
  
  
  1.14      +3 -3      
ws-fx/wss4j/src/org/apache/ws/axis/security/conversation/ConversationClientHandler.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/conversation/ConversationClientHandler.java.diff?r1=1.13&r2=1.14
  
  
  1.3       +1 -1      
ws-fx/wss4j/src/org/apache/ws/axis/security/trust/STSAgent.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/STSAgent.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +5 -21     
ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/InteropHandshaker.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/InteropHandshaker.java.diff?r1=1.2&r2=1.3
  
  
  1.2       +8 -17     
ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/SAML2SCTIssuer.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/SAML2SCTIssuer.java.diff?r1=1.1&r2=1.2
  
  
  1.4       +2 -20     
ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/SAML2SCTRequester.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/SAML2SCTRequester.java.diff?r1=1.3&r2=1.4
  
  
  1.3       +7 -9      
ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/UNT2SAMLIssuer.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/UNT2SAMLIssuer.java.diff?r1=1.2&r2=1.3
  
  
  1.2       +8 -12     
ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/UNT2SAMLRequester.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/axis/security/trust/secconv/interop/UNT2SAMLRequester.java.diff?r1=1.1&r2=1.2
  
  
  1.6       +12 -5     
ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationConstants.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationConstants.java.diff?r1=1.5&r2=1.6
  
  
  1.11      +3 -3      
ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationEngine.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationEngine.java.diff?r1=1.10&r2=1.11
  
  
  1.8       +2 -2      
ws-fx/wss4j/src/org/apache/ws/security/conversation/KeyDerivator.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/KeyDerivator.java.diff?r1=1.7&r2=1.8
  
  
  1.4       +2 -2      
ws-fx/wss4j/src/org/apache/ws/security/conversation/dkAlgo/AlgoFactory.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/dkAlgo/AlgoFactory.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +2 -2      
ws-fx/wss4j/src/org/apache/ws/security/conversation/dkAlgo/DerivationAlgorithm.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/dkAlgo/DerivationAlgorithm.java.diff?r1=1.3&r2=1.4
  
  
  1.5       +2 -2      
ws-fx/wss4j/src/org/apache/ws/security/conversation/dkAlgo/P_SHA1.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/dkAlgo/P_SHA1.java.diff?r1=1.4&r2=1.5
  
  
  1.6       +1 -1      
ws-fx/wss4j/src/org/apache/ws/security/conversation/message/info/SecurityContextInfo.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/message/info/SecurityContextInfo.java.diff?r1=1.5&r2=1.6
  
  
  1.8       +1 -1      
ws-fx/wss4j/src/org/apache/ws/security/conversation/message/token/DerivedKeyToken.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/message/token/DerivedKeyToken.java.diff?r1=1.7&r2=1.8
  
  
  1.2       +65 -50    
ws-fx/wss4j/src/org/apache/ws/security/policy/message/token/AppliesTo.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/policy/message/token/AppliesTo.java.diff?r1=1.1&r2=1.2
  
  
  1.4       +2 -12     
ws-fx/wss4j/src/org/apache/ws/security/trust/RequestResolver.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/RequestResolver.java.diff?r1=1.3&r2=1.4
  
  
  1.7       +72 -41    
ws-fx/wss4j/src/org/apache/ws/security/trust/TrustConstants.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/TrustConstants.java.diff?r1=1.6&r2=1.7
  
  
  1.4       +42 -35    
ws-fx/wss4j/src/org/apache/ws/security/trust/WSTrustException.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/WSTrustException.java.diff?r1=1.3&r2=1.4
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/RSTRParser.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/RSTRParser.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/errors.properties
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/errors.properties?rev=1.1
  
  
  1.3       +5 -5      
ws-fx/wss4j/src/org/apache/ws/security/trust/issue/X509ToSCTIssuer.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/issue/X509ToSCTIssuer.java.diff?r1=1.2&r2=1.3
  
  
  1.4       +18 -56    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/AllowPostdating.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/AllowPostdating.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +3 -3      
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/BaseToken.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/BaseToken.java.diff?r1=1.3&r2=1.4
  
  
  1.2       +44 -70    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/BinarySecret.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/BinarySecret.java.diff?r1=1.1&r2=1.2
  
  
  1.4       +34 -72    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Code.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Code.java.diff?r1=1.3&r2=1.4
  
  
  1.3       +46 -65    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/ComputedKey.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/ComputedKey.java.diff?r1=1.2&r2=1.3
  
  
  1.2       +39 -86    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Entropy.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Entropy.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +32 -46    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/KeySize.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/KeySize.java.diff?r1=1.1&r2=1.2
  
  
  1.4       +29 -94    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/LifeTime.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/LifeTime.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +31 -63    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Reason.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Reason.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +40 -75    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Renewing.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Renewing.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +28 -58    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestType.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestType.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +42 -61    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Status.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Status.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +30 -50    
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/TokenType.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/TokenType.java.diff?r1=1.3&r2=1.4
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/AbstractToken.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/AbstractToken.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Claims.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/Claims.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RenewTarget.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RenewTarget.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestSecurityToken.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestSecurityToken.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestSecurityTokenResponse.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestSecurityTokenResponse.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestedProofToken.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestedProofToken.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestedSecurityToken.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/src/org/apache/ws/security/trust/message/token/RequestedSecurityToken.java?rev=1.1
  
  
  1.5       +2 -6      ws-fx/wss4j/test/secconv/components/TestRSTR.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/components/TestRSTR.java.diff?r1=1.4&r2=1.5
  
  
  1.3       +2 -1      ws-fx/wss4j/test/secconv/scenarios/build.xml
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/build.xml.diff?r1=1.2&r2=1.3
  
  
  1.4       +33 -38    ws-fx/wss4j/test/secconv/scenarios/ping/impl/deploy.wsdd
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/deploy.wsdd.diff?r1=1.3&r2=1.4
  
  
  1.1                  
ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingBindingStub.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingBindingStub.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingPort.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingPort.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingService.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingService.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingServiceLocator.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/PingServiceLocator.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/test/secconv/scenarios/ping/impl/TicketType.java
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/TicketType.java?rev=1.1
  
  
  1.1                  
ws-fx/wss4j/test/secconv/scenarios/ping/impl/undeploy.wsdd
  
  
http://cvs.apache.org/viewcvs/ws-fx/wss4j/test/secconv/scenarios/ping/impl/undeploy.wsdd?rev=1.1
  
  

Reply via email to