You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by sa...@apache.org on 2006/02/28 11:41:18 UTC

svn commit: r381626 [2/8] - in /webservices/commons/modules/policy: examples/wsse/src/secParser/ src/org/apache/ws/policy/ src/org/apache/ws/policy/util/ test-resources/intersected/ test-resources/merged/ test/org/apache/ws/policy/

Modified: webservices/commons/modules/policy/src/org/apache/ws/policy/XorCompositeAssertion.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/src/org/apache/ws/policy/XorCompositeAssertion.java?rev=381626&r1=381625&r2=381626&view=diff
==============================================================================
--- webservices/commons/modules/policy/src/org/apache/ws/policy/XorCompositeAssertion.java (original)
+++ webservices/commons/modules/policy/src/org/apache/ws/policy/XorCompositeAssertion.java Tue Feb 28 02:40:59 2006
@@ -28,216 +28,292 @@
  * that exactly one of its terms (policy alternative) is statisfied.
  *  
  */
-public class XorCompositeAssertion extends CompositeAssertion implements
-        Assertion {
-    
-    private Log log =
-        LogFactory.getLog(this.getClass().getName());
-
-    public XorCompositeAssertion() {
-    }
-
-    public void addTerm(Assertion assertion) {
-        if (!(isNormalized() && (assertion instanceof AndCompositeAssertion) && ((AndCompositeAssertion) assertion)
-                .isNormalized())) {
-            setNormalized(false);
-        }
-        super.addTerm(assertion);
-    }
-
-    public Assertion normalize(PolicyRegistry reg) {
-        log.debug("Enter: XorCompositeAssertion::normalize");
-        
-        if (isNormalized()) { return this;}
-        
-        XorCompositeAssertion XOR = new XorCompositeAssertion();
-        
-        if (isEmpty()) {
-            XOR.setNormalized(true);
-            return XOR;
-        }
-        
-        Iterator terms = getTerms().iterator();
-       
-        while (terms.hasNext()) {
-            Assertion term = (Assertion) terms.next();
-            term = (term instanceof Policy) ? term : term.normalize(reg);
-
-            if (term instanceof Policy) {
-                Assertion wrapper = new AndCompositeAssertion();
-                ((AndCompositeAssertion) wrapper).addTerms(((Policy) term)
-                        .getTerms());
-                wrapper = wrapper.normalize(reg);
-
-                if (wrapper instanceof AndCompositeAssertion) {
-                    XOR.addTerm(wrapper);
-
-                } else {
-                    XOR.addTerms(((XorCompositeAssertion) wrapper).getTerms());
-                }
-                continue;
-            }
-
-            if (term instanceof PrimitiveAssertion) {
-                AndCompositeAssertion wrapper = new AndCompositeAssertion();
-                wrapper.addTerm(term);
-                XOR.addTerm(wrapper);
-                continue;
-            }
-
-            if (term instanceof XorCompositeAssertion) {
-                XOR.addTerms(((XorCompositeAssertion) term).getTerms());
-                continue;
-            }
-
-            if (term instanceof AndCompositeAssertion) {
-                XOR.addTerm(term);
-            }
-        }
-
-        XOR.setNormalized(true);
-        return XOR;
-    }
-
-    public Assertion intersect(Assertion assertion, PolicyRegistry reg) {
-        log.debug("Enter: XorCompositeAssertion::intersect");
-        
-        CompositeAssertion normalizedMe = (CompositeAssertion) ((isNormalized()) ? this
-                : normalize(reg));
-
-        if (!(normalizedMe instanceof XorCompositeAssertion)) {
-            return normalizedMe.intersect(assertion, reg);
-        }
-
-        XorCompositeAssertion result = new XorCompositeAssertion();
-
-        if (assertion instanceof PrimitiveAssertion) {
-
-            Iterator iterator = normalizedMe.getTerms().iterator();
-
-            while (iterator.hasNext()) {
-                AndCompositeAssertion andTerm = (AndCompositeAssertion) iterator
-                        .next();
-                Assertion value = andTerm.intersect(assertion);
-                if (value instanceof AndCompositeAssertion) {
-                    result.addTerm(value);
-                }
-            }
-
-        } else {
-            CompositeAssertion target = (CompositeAssertion) assertion;
-            target = (CompositeAssertion) ((target.isNormalized()) ? target
-                    : target.normalize(reg));
-
-            Iterator iterator = normalizedMe.getTerms().iterator();
-            while (iterator.hasNext()) {
-                AndCompositeAssertion andTerm = (AndCompositeAssertion) iterator
-                        .next();
-
-                if (target instanceof AndCompositeAssertion) {
-                    Assertion value = andTerm.intersect(target);
-
-                    if (value instanceof AndCompositeAssertion) {
-                        result.addTerm(value);
-                    }
-
-                } else if (target instanceof XorCompositeAssertion) {
-
-                    Iterator andTerms = target.getTerms().iterator();
-
-                    while (andTerms.hasNext()) {
-                        AndCompositeAssertion tAndTerm = (AndCompositeAssertion) andTerms
-                                .next();
-                        Assertion value = andTerm.intersect(tAndTerm);
-
-                        if (value instanceof AndCompositeAssertion) {
-                            result.addTerm(value);
-                        }
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-    public Assertion merge(Assertion assertion, PolicyRegistry reg) {
-        log.debug("Enter: XorCompositeAssertion::merge");
-        
-        CompositeAssertion normalizedMe = (CompositeAssertion) ((isNormalized()) ? this
-                : normalize(reg));
-
-        if (!(normalizedMe instanceof XorCompositeAssertion)) {
-            return normalizedMe.merge(assertion, reg);
-        }
-
-        if (assertion instanceof PrimitiveAssertion) {
-            XorCompositeAssertion xorTerm = new XorCompositeAssertion();
-
-            Iterator iterator = normalizedMe.getTerms().iterator();
-            if (iterator.hasNext()) {
-                do {
-                    AndCompositeAssertion andTerm = new AndCompositeAssertion();
-                    andTerm.addTerm(assertion);
-                    AndCompositeAssertion anAndTerm = (AndCompositeAssertion) iterator
-                            .next();
-                    andTerm.addTerms(anAndTerm.getTerms());
-                    xorTerm.addTerm(andTerm);
-                } while (iterator.hasNext());
-            } else {
-                AndCompositeAssertion andTerm = new AndCompositeAssertion();
-                andTerm.addTerm(assertion);
-                xorTerm.addTerm(andTerm);
-            }
-            xorTerm.setNormalized(true);
-            return xorTerm;
-        }
-
-        CompositeAssertion target = (CompositeAssertion) assertion;
-        target = (CompositeAssertion) ((target.isNormalized()) ? target
-                : target.normalize(reg));
-
-        if (target instanceof Policy) {
-            XorCompositeAssertion xorTerm = (XorCompositeAssertion) target
-                    .getTerms().get(0);
-            return normalizedMe.merge(xorTerm);
-
-        } else if (target instanceof XorCompositeAssertion) {
-            XorCompositeAssertion xorTerm = new XorCompositeAssertion();
-            Iterator hisAndTerms = target.getTerms().iterator();
-            Iterator myAndTerms = normalizedMe.getTerms().iterator();
-
-            while (myAndTerms.hasNext()) {
-                AndCompositeAssertion myAndTerm = (AndCompositeAssertion) myAndTerms
-                        .next();
-                while (hisAndTerms.hasNext()) {
-                    AndCompositeAssertion hisAndTerm = (AndCompositeAssertion) hisAndTerms
-                            .next();
-                    xorTerm.addTerm(myAndTerm.merge(hisAndTerm));
-                }
-            }
-
-            xorTerm.setNormalized(true);
-            return xorTerm;
-
-        } else if (target instanceof AndCompositeAssertion) {
-            XorCompositeAssertion xorTerm = new XorCompositeAssertion();
-            Iterator myAndTerms = normalizedMe.getTerms().iterator();
-
-            while (myAndTerms.hasNext()) {
-                AndCompositeAssertion andTerm = new AndCompositeAssertion();
-                andTerm.addTerms(target.getTerms());
-                AndCompositeAssertion myAndTerm = (AndCompositeAssertion) myAndTerms
-                        .next();
-                andTerm.addTerms(myAndTerm.getTerms());
-                xorTerm.addTerm(andTerm);
-            }
-
-            xorTerm.setNormalized(true);
-            return xorTerm;
-        }
-
-        throw new IllegalArgumentException("error : merge is not defined for"
-                + target.getClass().getName());
-    }
-}
+public class XorCompositeAssertion extends AbstractAssertion implements
+		CompositeAssertion {
+
+	private Log log = LogFactory.getLog(this.getClass().getName());
+
+	public XorCompositeAssertion() {
+	}
+
+	public void addTerm(Assertion assertion) {
+		if (!(isNormalized() && (assertion instanceof AndCompositeAssertion) && ((AndCompositeAssertion) assertion)
+				.isNormalized())) {
+			setNormalized(false);
+		}
+		super.addTerm(assertion);
+	}
+
+	public Assertion normalize(PolicyRegistry reg) {
+		log.debug("Enter: XorCompositeAssertion::normalize");
+
+		if (isNormalized()) {
+			return this;
+		}
+
+		XorCompositeAssertion XOR = new XorCompositeAssertion();
+
+		if (isEmpty()) {
+			XOR.setNormalized(true);
+			return XOR;
+		}
+
+		Iterator terms = getTerms().iterator();
+
+		while (terms.hasNext()) {
+			Assertion term = (Assertion) terms.next();
+			term = (term instanceof Policy) ? term : term.normalize(reg);
+
+			if (term instanceof Policy) {
+				Assertion wrapper = new AndCompositeAssertion();
+				((AndCompositeAssertion) wrapper).addTerms(((Policy) term)
+						.getTerms());
+				wrapper = wrapper.normalize(reg);
+
+				if (wrapper instanceof AndCompositeAssertion) {
+					XOR.addTerm(wrapper);
+
+				} else {
+					XOR.addTerms(((XorCompositeAssertion) wrapper).getTerms());
+				}
+				continue;
+			}
+
+			if (term instanceof PrimitiveAssertion) {
+				AndCompositeAssertion wrapper = new AndCompositeAssertion();
+				wrapper.addTerm(term);
+				XOR.addTerm(wrapper);
+				continue;
+			}
+
+			if (term instanceof XorCompositeAssertion) {
+				XOR.addTerms(((XorCompositeAssertion) term).getTerms());
+				continue;
+			}
+
+			if (term instanceof AndCompositeAssertion) {
+				XOR.addTerm(term);
+			}
+		}
+
+		XOR.setNormalized(true);
+		return XOR;
+	}
+
+	public Assertion intersect(Assertion assertion, PolicyRegistry reg) {
+		log.debug("Enter: XorCompositeAssertion::intersect");
+
+		Assertion normalizedMe = (isNormalized()) ? this : normalize(reg);
+
+		if (!(normalizedMe instanceof XorCompositeAssertion)) {
+			return normalizedMe.intersect(assertion, reg);
+		}
+
+		Assertion target = (assertion.isNormalized()) ? assertion : assertion
+				.normalize(reg);
+		short type = target.getType();
+
+		switch (type) {
+		
+		case Assertion.COMPOSITE_POLICY_TYPE: {
+			Policy nPOLICY = new Policy();
+			nPOLICY.addTerm(((XorCompositeAssertion) normalizedMe.getTerms()
+					.get(0)).intersect(target));
+			return nPOLICY;
+		}
+		
+		case Assertion.COMPOSITE_XOR_TYPE: {
+			XorCompositeAssertion nXOR = new XorCompositeAssertion();
+
+			Assertion asser;
+			AndCompositeAssertion AND;
+			
+			for (Iterator iterator = normalizedMe.getTerms().iterator(); iterator.hasNext(); ) {
+				AND = (AndCompositeAssertion) iterator.next();
+				
+				for (Iterator iterator2 = target.getTerms().iterator(); iterator2.hasNext(); ) {
+					asser = AND.intersect((AndCompositeAssertion) iterator2.next());
+					
+					if (asser instanceof AndCompositeAssertion) {
+						nXOR.addTerm(asser);
+					}
+				}
+			}
+			
+			return nXOR;
+		}
+		
+		case Assertion.COMPOSITE_AND_TYPE : {
+			XorCompositeAssertion nXOR = new XorCompositeAssertion();
+			Assertion asser;
+			
+			for (Iterator iterator = normalizedMe.getTerms().iterator(); iterator.hasNext();) {
+				asser = ((AndCompositeAssertion) iterator.next()).intersect(target);
+				
+				if (asser instanceof AndCompositeAssertion) {
+					nXOR.addTerm(asser);
+				}
+			}
+			return nXOR;
+		}
+		
+		case Assertion.PRIMITIVE_TYPE: {
+			XorCompositeAssertion nXOR = new XorCompositeAssertion();
+			
+			Assertion asser;
+			
+			for (Iterator iterator = normalizedMe.getTerms().iterator(); iterator.hasNext(); ) {
+				asser = ((AndCompositeAssertion) iterator.next()).intersect(target);
+				
+				if (asser instanceof AndCompositeAssertion) {
+					nXOR.addTerm(asser);
+				}
+			}
+			return nXOR;
+		}
+		
+		default: {
+			throw new IllegalArgumentException("intersect for assertion type " + target.getClass().getName() + " not defined");
+		}
+		
+		}
+		
+		
+//
+//		XorCompositeAssertion result = new XorCompositeAssertion();
+//
+//		if (assertion instanceof PrimitiveAssertion) {
+//
+//			Iterator iterator = normalizedMe.getTerms().iterator();
+//
+//			while (iterator.hasNext()) {
+//				AndCompositeAssertion andTerm = (AndCompositeAssertion) iterator
+//						.next();
+//				Assertion value = andTerm.intersect(assertion);
+//				if (value instanceof AndCompositeAssertion) {
+//					result.addTerm(value);
+//				}
+//			}
+//
+//		} else {
+//
+//			Iterator iterator = normalizedMe.getTerms().iterator();
+//			while (iterator.hasNext()) {
+//				AndCompositeAssertion andTerm = (AndCompositeAssertion) iterator
+//						.next();
+//
+//				if (target instanceof AndCompositeAssertion) {
+//					Assertion value = andTerm.intersect(target);
+//
+//					if (value instanceof AndCompositeAssertion) {
+//						result.addTerm(value);
+//					}
+//
+//				} else if (target instanceof XorCompositeAssertion) {
+//
+//					Iterator andTerms = target.getTerms().iterator();
+//
+//					while (andTerms.hasNext()) {
+//						AndCompositeAssertion tAndTerm = (AndCompositeAssertion) andTerms
+//								.next();
+//						Assertion value = andTerm.intersect(tAndTerm);
+//
+//						if (value instanceof AndCompositeAssertion) {
+//							result.addTerm(value);
+//						}
+//					}
+//				}
+//			}
+//		}
+//
+//		return result;
+	}
+
+	public Assertion merge(Assertion assertion, PolicyRegistry reg) {
+		log.debug("Enter: XorCompositeAssertion::merge");
+
+		Assertion normalizedMe = (isNormalized()) ? this : normalize(reg);
+
+		if (!(normalizedMe instanceof XorCompositeAssertion)) {
+			return normalizedMe.merge(assertion, reg);
+		}
+
+		Assertion target = (assertion.isNormalized()) ? assertion : assertion
+				.normalize(reg);
+
+		short type = target.getType();
+
+		switch (type) {
+
+		case Assertion.COMPOSITE_POLICY_TYPE: {
+
+			Policy nPOLICY = new Policy();
+			nPOLICY.addTerm(normalizedMe.merge((Assertion) target.getTerms()
+					.get(0)));
+			return nPOLICY;
+		}
+
+		case Assertion.COMPOSITE_XOR_TYPE: {
+
+			XorCompositeAssertion nXOR = new XorCompositeAssertion();
+
+			for (Iterator iterator = normalizedMe.getTerms().iterator(); iterator
+					.hasNext();) {
+				AndCompositeAssertion AND = (AndCompositeAssertion) iterator
+						.next();
+
+				for (Iterator iterator2 = target.getTerms().iterator(); iterator2
+						.hasNext();) {
+					nXOR.addTerm(AND.merge((Assertion) iterator2.next()));
+				}
+
+				if (target.isEmpty() && AND.isEmpty()) { // FIXME is this a
+														 // hack?
+					/*
+					 * " <wsp:ExactlyOne> <wsp:All/>
+					 * </wsp:ExactlyOne>".intersect(" <wsp:ExactlyOne/>")
+					 */
+					nXOR.addTerm(AND);
+				}
+			}
+
+			return nXOR;
+		}
+
+		case Assertion.COMPOSITE_AND_TYPE: {
+
+			XorCompositeAssertion nXOR = new XorCompositeAssertion();
+
+			for (Iterator iterator = normalizedMe.getTerms().iterator(); iterator
+					.hasNext();) {
+				nXOR.addTerm(((AndCompositeAssertion) iterator.next())
+						.merge(target));
+			}
+			return nXOR;
+
+		}
+
+		case Assertion.PRIMITIVE_TYPE: {
+			XorCompositeAssertion nXOR = new XorCompositeAssertion();
+
+			for (Iterator iterator = normalizedMe.getTerms().iterator(); iterator
+					.hasNext();) {
+				nXOR.addTerm(((AndCompositeAssertion) iterator.next())
+						.merge(target));
+			}
+
+			return nXOR;
+		}
+
+		default: {
+			throw new IllegalArgumentException("merge is not defined for "
+					+ target.getClass().getName() + " type assertions");
+		}
+
+		}
+	}
+
+	public final short getType() {
+		return Assertion.COMPOSITE_XOR_TYPE;
+	}
+}
\ No newline at end of file

Modified: webservices/commons/modules/policy/src/org/apache/ws/policy/util/OMPolicyReader.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/src/org/apache/ws/policy/util/OMPolicyReader.java?rev=381626&r1=381625&r2=381626&view=diff
==============================================================================
--- webservices/commons/modules/policy/src/org/apache/ws/policy/util/OMPolicyReader.java (original)
+++ webservices/commons/modules/policy/src/org/apache/ws/policy/util/OMPolicyReader.java Tue Feb 28 02:40:59 2006
@@ -136,7 +136,7 @@
         String strValue = element.getText();
 
         if (strValue != null && strValue.length() != 0) {
-            result.setStrValue(strValue);
+            result.setStrValue(strValue.trim());
         }
 
         //CHECK ME

Added: webservices/commons/modules/policy/test-resources/intersected/Policy21-21.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy21-21.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy21-21.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy21-21.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"><wsp:ExactlyOne/></wsp:Policy>
\ No newline at end of file

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy21-21.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy21-22.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy21-22.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy21-22.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy21-22.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"><wsp:ExactlyOne/></wsp:Policy>
\ No newline at end of file

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy21-22.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy21-23.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy21-23.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy21-23.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy21-23.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy21-23.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy21-24.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy21-24.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy21-24.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy21-24.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy21-24.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy21-25.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy21-25.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy21-25.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy21-25.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy21-25.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy22-21.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy22-21.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy22-21.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy22-21.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"><wsp:ExactlyOne/></wsp:Policy>
\ No newline at end of file

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy22-21.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy22-22.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy22-22.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy22-22.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy22-22.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"><wsp:ExactlyOne><wsp:All/></wsp:ExactlyOne></wsp:Policy>
\ No newline at end of file

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy22-22.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy22-23.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy22-23.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy22-23.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy22-23.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy22-23.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy22-24.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy22-24.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy22-24.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy22-24.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy22-24.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy22-25.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy22-25.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy22-25.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy22-25.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy22-25.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy23-21.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy23-21.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy23-21.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy23-21.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy23-21.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy23-22.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy23-22.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy23-22.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy23-22.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy23-22.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy23-23.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy23-23.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy23-23.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy23-23.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,386 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy23-23.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy23-24.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy23-24.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy23-24.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy23-24.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,132 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy23-24.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy23-25.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy23-25.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy23-25.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy23-25.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,132 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy23-25.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy24-21.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy24-21.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy24-21.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy24-21.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy24-21.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy24-22.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy24-22.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy24-22.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy24-22.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy24-22.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy24-23.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy24-23.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy24-23.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy24-23.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,132 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy24-23.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy24-24.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy24-24.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy24-24.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy24-24.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,258 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy24-24.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy24-25.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy24-25.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy24-25.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy24-25.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,258 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy24-25.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy25-21.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy25-21.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy25-21.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy25-21.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy25-21.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test-resources/intersected/Policy25-22.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/intersected/Policy25-22.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/intersected/Policy25-22.xml (added)
+++ webservices/commons/modules/policy/test-resources/intersected/Policy25-22.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne />
+</wsp:Policy>

Propchange: webservices/commons/modules/policy/test-resources/intersected/Policy25-22.xml
------------------------------------------------------------------------------
    svn:executable = *