axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject svn commit: r406954 [3/3] - in /webservices/axis2/trunk/java: etc/ modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/ modules/codegen/src/org/apache/axis2/wsdl/template/java/ modules/core/src/org/apache/axis2/client/ modules/core/src/org/apac...
Date Tue, 16 May 2006 14:27:50 GMT
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java?rev=406954&r1=406953&r2=406954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
Tue May 16 07:27:47 2006
@@ -19,11 +19,11 @@
 import org.apache.axis2.namespace.Constants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.ws.policy.AndCompositeAssertion;
+import org.apache.ws.policy.All;
 import org.apache.ws.policy.Assertion;
 import org.apache.ws.policy.Policy;
 import org.apache.ws.policy.PrimitiveAssertion;
-import org.apache.ws.policy.XorCompositeAssertion;
+import org.apache.ws.policy.ExactlyOne;
 import org.apache.ws.policy.util.PolicyFactory;
 import org.apache.ws.policy.util.PolicyReader;
 import org.apache.ws.security.policy.WSSPolicyException;
@@ -202,7 +202,7 @@
         	policy = (Policy) policy.normalize();
         }
 
-        XorCompositeAssertion xor = (XorCompositeAssertion) policy.getTerms()
+        ExactlyOne xor = (ExactlyOne) policy.getTerms()
                 .get(0);
         List listOfPolicyAlternatives = xor.getTerms();
 
@@ -210,7 +210,7 @@
         int numberOfAlternatives = listOfPolicyAlternatives.size();
 
         for (int i = 0; !success && i < numberOfAlternatives; i++) {
-            AndCompositeAssertion aPolicyAlternative = (AndCompositeAssertion) listOfPolicyAlternatives
+            All aPolicyAlternative = (All) listOfPolicyAlternatives
                     .get(i);
 
             List listOfAssertions = aPolicyAlternative.getTerms();
@@ -313,7 +313,7 @@
                                 + currentToken.getTokenName());
                 return false;
             }
-
+
             if(spt.getTokenType() == SecurityPolicyToken.COMPLEX_TOKEN && secProcessorContext.getAction()
== SecurityProcessorContext.START) {
                 secProcessorContext.pushPolicyEngineData(PolicyEngineData.copy(pa.getName()));
             }



Mime
View raw message