You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ru...@apache.org on 2006/05/23 15:21:07 UTC
svn commit: r408888 - in /webservices/wss4j/trunk: lib/neethi-SNAPSHOT.jar
lib/policy.jar
src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
Author: ruchithf
Date: Tue May 23 06:21:06 2006
New Revision: 408888
URL: http://svn.apache.org/viewvc?rev=408888&view=rev
Log:
Updating wss4j to the latest policy (now NEETHI) snapshot
Added:
webservices/wss4j/trunk/lib/neethi-SNAPSHOT.jar (with props)
Removed:
webservices/wss4j/trunk/lib/policy.jar
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
Added: webservices/wss4j/trunk/lib/neethi-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/lib/neethi-SNAPSHOT.jar?rev=408888&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/wss4j/trunk/lib/neethi-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java?rev=408888&r1=408887&r2=408888&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java Tue May 23 06:21:06 2006
@@ -25,11 +25,11 @@
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.ExactlyOne;
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PrimitiveAssertion;
-import org.apache.ws.policy.XorCompositeAssertion;
import org.apache.ws.policy.util.PolicyFactory;
import org.apache.ws.policy.util.PolicyReader;
import org.apache.ws.security.policy.Constants;
@@ -202,7 +202,7 @@
throw new RuntimeException("Policy is not in normalized format");
}
- 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org