You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ws.apache.org by sa...@apache.org on 2005/12/11 18:22:06 UTC

svn commit: r355982 - in /webservices/commons/trunk/policy/src: examples/ org/apache/ws/policy/ org/apache/ws/policy/model/ org/apache/ws/policy/util/

Author: sanka
Date: Sun Dec 11 09:21:17 2005
New Revision: 355982

URL: http://svn.apache.org/viewcvs?rev=355982&view=rev
Log:
Moved: org.apache.ws.policy.model.* classes to org.apache.ws.policy.* 

Added:
    webservices/commons/trunk/policy/src/org/apache/ws/policy/AndCompositeAssertion.java
      - copied, changed from r355960, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/Assertion.java
      - copied, changed from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/CompositeAssertion.java
      - copied, changed from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/Policy.java
      - copied, changed from r355960, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyConstants.java
      - copied, changed from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyReference.java
      - copied, changed from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/PrimitiveAssertion.java
      - copied, changed from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/XorCompositeAssertion.java
      - copied, changed from r355960, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java
Removed:
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java
Modified:
    webservices/commons/trunk/policy/src/examples/PolicyExampleBindMsg.java
    webservices/commons/trunk/policy/src/examples/SimplePolicyExample.java
    webservices/commons/trunk/policy/src/examples/WSSPolicyProcessor.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyAttachmentUtil.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyReader.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyRegistry.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyUtil.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyWriter.java
    webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java

Modified: webservices/commons/trunk/policy/src/examples/PolicyExampleBindMsg.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/examples/PolicyExampleBindMsg.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/examples/PolicyExampleBindMsg.java (original)
+++ webservices/commons/trunk/policy/src/examples/PolicyExampleBindMsg.java Sun Dec 11 09:21:17 2005
@@ -19,7 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 
-import org.apache.ws.policy.model.Policy;
+import org.apache.ws.policy.Policy;
 import org.apache.ws.policy.util.PolicyReader;
 import org.apache.ws.policy.util.PolicyFactory;
 import org.apache.ws.policy.util.PolicyWriter;

Modified: webservices/commons/trunk/policy/src/examples/SimplePolicyExample.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/examples/SimplePolicyExample.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/examples/SimplePolicyExample.java (original)
+++ webservices/commons/trunk/policy/src/examples/SimplePolicyExample.java Sun Dec 11 09:21:17 2005
@@ -19,7 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 
-import org.apache.ws.policy.model.Policy;
+import org.apache.ws.policy.Policy;
 import org.apache.ws.policy.util.PolicyReader;
 import org.apache.ws.policy.util.PolicyFactory;
 import org.apache.ws.policy.util.PolicyWriter;

Modified: webservices/commons/trunk/policy/src/examples/WSSPolicyProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/examples/WSSPolicyProcessor.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/examples/WSSPolicyProcessor.java (original)
+++ webservices/commons/trunk/policy/src/examples/WSSPolicyProcessor.java Sun Dec 11 09:21:17 2005
@@ -21,10 +21,10 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ws.policy.model.AndCompositeAssertion;
-import org.apache.ws.policy.model.Policy;
-import org.apache.ws.policy.model.PrimitiveAssertion;
-import org.apache.ws.policy.model.XorCompositeAssertion;
+import org.apache.ws.policy.AndCompositeAssertion;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.PrimitiveAssertion;
+import org.apache.ws.policy.XorCompositeAssertion;
 import org.apache.ws.policy.util.PolicyReader;
 import org.apache.ws.policy.util.PolicyFactory;
 

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/AndCompositeAssertion.java (from r355960, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/AndCompositeAssertion.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/AndCompositeAssertion.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java&r1=355960&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/AndCompositeAssertion.java Sun Dec 11 09:21:17 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/Assertion.java (from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/Assertion.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/Assertion.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java&r1=355959&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/Assertion.java Sun Dec 11 09:21:17 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import org.apache.ws.policy.util.PolicyRegistry;
 

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/CompositeAssertion.java (from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/CompositeAssertion.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/CompositeAssertion.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java&r1=355959&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/CompositeAssertion.java Sun Dec 11 09:21:17 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/Policy.java (from r355960, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/Policy.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/Policy.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java&r1=355960&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/Policy.java Sun Dec 11 09:21:17 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyConstants.java (from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyConstants.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyConstants.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java&r1=355959&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyConstants.java Sun Dec 11 09:21:17 2005
@@ -1,4 +1,4 @@
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  * 

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyReference.java (from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyReference.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyReference.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java&r1=355959&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/PolicyReference.java Sun Dec 11 09:21:17 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import org.apache.ws.policy.util.PolicyRegistry;
 

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/PrimitiveAssertion.java (from r355959, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/PrimitiveAssertion.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/PrimitiveAssertion.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java&r1=355959&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/PrimitiveAssertion.java Sun Dec 11 09:21:17 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

Copied: webservices/commons/trunk/policy/src/org/apache/ws/policy/XorCompositeAssertion.java (from r355960, webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java)
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/XorCompositeAssertion.java?p2=webservices/commons/trunk/policy/src/org/apache/ws/policy/XorCompositeAssertion.java&p1=webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java&r1=355960&r2=355982&rev=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/XorCompositeAssertion.java Sun Dec 11 09:21:17 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.ws.policy.model;
+package org.apache.ws.policy;
 
 import java.util.Iterator;
 

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/DOMPolicyReader.java Sun Dec 11 09:21:17 2005
@@ -36,13 +36,13 @@
 import org.w3c.dom.NamedNodeMap;
 import org.xml.sax.SAXException;
 
-import org.apache.ws.policy.model.AndCompositeAssertion;
-import org.apache.ws.policy.model.Assertion;
-import org.apache.ws.policy.model.Policy;
-import org.apache.ws.policy.model.PolicyReference;
-import org.apache.ws.policy.model.PrimitiveAssertion;
-import org.apache.ws.policy.model.PolicyConstants;
-import org.apache.ws.policy.model.XorCompositeAssertion;
+import org.apache.ws.policy.AndCompositeAssertion;
+import org.apache.ws.policy.Assertion;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.PolicyReference;
+import org.apache.ws.policy.PrimitiveAssertion;
+import org.apache.ws.policy.PolicyConstants;
+import org.apache.ws.policy.XorCompositeAssertion;
 
 /**
  * @author Werner Dittmann (werner@apache.org)

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/OMPolicyReader.java Sun Dec 11 09:21:17 2005
@@ -31,13 +31,13 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMXMLParserWrapper;
 import org.apache.axis2.om.impl.llom.factory.OMXMLBuilderFactory;
-import org.apache.ws.policy.model.AndCompositeAssertion;
-import org.apache.ws.policy.model.Assertion;
-import org.apache.ws.policy.model.Policy;
-import org.apache.ws.policy.model.PolicyReference;
-import org.apache.ws.policy.model.PrimitiveAssertion;
-import org.apache.ws.policy.model.PolicyConstants;
-import org.apache.ws.policy.model.XorCompositeAssertion;
+import org.apache.ws.policy.AndCompositeAssertion;
+import org.apache.ws.policy.Assertion;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.PolicyReference;
+import org.apache.ws.policy.PrimitiveAssertion;
+import org.apache.ws.policy.PolicyConstants;
+import org.apache.ws.policy.XorCompositeAssertion;
 
 /**
  * @author Sanka Samaranayake (sanka@apache.org)

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyAttachmentUtil.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyAttachmentUtil.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyAttachmentUtil.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyAttachmentUtil.java Sun Dec 11 09:21:17 2005
@@ -30,9 +30,9 @@
 
 import org.apache.axis2.wsdl.WSDLVersionWrapper;
 import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
-import org.apache.ws.policy.model.Assertion;
-import org.apache.ws.policy.model.Policy;
-import org.apache.ws.policy.model.PolicyConstants;
+import org.apache.ws.policy.Assertion;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.PolicyConstants;
 import org.apache.wsdl.Component;
 import org.apache.wsdl.MessageReference;
 import org.apache.wsdl.WSDLBinding;

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyReader.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyReader.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyReader.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyReader.java Sun Dec 11 09:21:17 2005
@@ -18,7 +18,7 @@
 
 import java.io.InputStream;
 
-import org.apache.ws.policy.model.Policy;
+import org.apache.ws.policy.Policy;
 
 /**
  * @author Sanka Samaranayake (sanka@apache.org)

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyRegistry.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyRegistry.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyRegistry.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyRegistry.java Sun Dec 11 09:21:17 2005
@@ -19,7 +19,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.ws.policy.model.Policy;
+import org.apache.ws.policy.Policy;
 
 /**
  * PolicyRegistry is contains reference to external policy that are used by the

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyUtil.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyUtil.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyUtil.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyUtil.java Sun Dec 11 09:21:17 2005
@@ -21,10 +21,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.ws.policy.model.AndCompositeAssertion;
-import org.apache.ws.policy.model.Policy;
-import org.apache.ws.policy.model.PrimitiveAssertion;
-import org.apache.ws.policy.model.XorCompositeAssertion;
+import org.apache.ws.policy.AndCompositeAssertion;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.PrimitiveAssertion;
+import org.apache.ws.policy.XorCompositeAssertion;
 
 /**
  * WSPolicyUtil contains several utility methods for policy manipulations.

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyWriter.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyWriter.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyWriter.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyWriter.java Sun Dec 11 09:21:17 2005
@@ -18,7 +18,7 @@
 
 import java.io.OutputStream;
 
-import org.apache.ws.policy.model.Policy;
+import org.apache.ws.policy.Policy;
 
 /**
  * @author Sanka Samaranayake (sanka@apache.org)

Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java?rev=355982&r1=355981&r2=355982&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java Sun Dec 11 09:21:17 2005
@@ -26,13 +26,13 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.ws.policy.model.AndCompositeAssertion;
-import org.apache.ws.policy.model.Assertion;
-import org.apache.ws.policy.model.Policy;
-import org.apache.ws.policy.model.PolicyConstants;
-import org.apache.ws.policy.model.PolicyReference;
-import org.apache.ws.policy.model.PrimitiveAssertion;
-import org.apache.ws.policy.model.XorCompositeAssertion;
+import org.apache.ws.policy.AndCompositeAssertion;
+import org.apache.ws.policy.Assertion;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.PolicyConstants;
+import org.apache.ws.policy.PolicyReference;
+import org.apache.ws.policy.PrimitiveAssertion;
+import org.apache.ws.policy.XorCompositeAssertion;
 
 /**
  * @author Sanka Samaranayake (sanka@apache.org)