Author: dims
Date: Thu Nov 24 22:06:23 2005
New Revision: 348885
URL: http://svn.apache.org/viewcvs?rev=348885&view=rev
Log:
- change package from org.apache.policy to org.apache.ws.policy
- Added maven build script, removed ant build.xml
- removed the checked in jars
Added:
webservices/commons/trunk/policy/project.properties
webservices/commons/trunk/policy/project.xml
webservices/commons/trunk/policy/src/org/apache/ws/
webservices/commons/trunk/policy/src/org/apache/ws/policy/
- copied from r348880,
webservices/commons/trunk/policy/src/org/apache/policy/
Removed:
webservices/commons/trunk/policy/build.xml
webservices/commons/trunk/policy/lib/
webservices/commons/trunk/policy/src/org/apache/policy/
Modified:
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
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyAttachmentUtil.java
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyFactory.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/StringUtils.java
Added: webservices/commons/trunk/policy/project.properties
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/project.properties?rev=348885&view=auto
==============================================================================
--- webservices/commons/trunk/policy/project.properties (added)
+++ webservices/commons/trunk/policy/project.properties Thu Nov 24 22:06:23 2005
@@ -0,0 +1,25 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+maven.xdoc.date=left
+## maven.xdoc.version=${pom.currentVersion}
+
+axis2.version=0.93-dev
+stax.api.version=1.0
+stax.impl.groupid=stax
+stax.impl.artifactid=stax
+stax.impl.version=1.1.2-dev
+axis.wsdl4j.version=1.2
Added: webservices/commons/trunk/policy/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/project.xml?rev=348885&view=auto
==============================================================================
--- webservices/commons/trunk/policy/project.xml (added)
+++ webservices/commons/trunk/policy/project.xml Thu Nov 24 22:06:23 2005
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+
+<project>
+ <!-- the version of maven's project object model -->
+
+ <pomVersion>3</pomVersion>
+ <!-- a unique name for this project -->
+
+ <name>Web Services Commons : WS-Policy implemenation</name>
+ <id>ws-policy</id>
+ <groupId>ws-commons</groupId>
+
+ <!-- a short but descriptive name for the project -->
+
+ <name>WS-Policy Implementation</name>
+ <!-- The version of the project under development, e.g.
+ 1.1, 1.2, 2.0-SNAPSHOT -->
+
+ <currentVersion>1.0</currentVersion>
+ <!-- details about the organization that 'owns' the project -->
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <!-- the year the project started -->
+
+ <inceptionYear>2002</inceptionYear>
+ <package>org.apache.policy</package>
+
+ <!-- any mailing lists for the project -->
+
+ <mailingLists/>
+ <!-- who the developers are for the project -->
+
+ <developers/>
+ <!-- jar files the project is dependent on -->
+
+ <dependencies>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-xml</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-wsdl</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${stax.impl.groupid}</groupId>
+ <artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+ <!-- build information for the project -->
+
+ <build>
+ <nagEmailAddress>[email protected]</nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ </build>
+</project>
Modified:
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/model/AndCompositeAssertion.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java
Thu Nov 24 22:06:23 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
import java.util.ArrayList;
import java.util.Iterator;
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
-import org.apache.policy.util.PolicyRegistry;
+import org.apache.ws.policy.util.PolicyRegistry;
/**
* AndCompositeAssertion represents either policy or a single policy
Modified:
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/model/Assertion.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Assertion.java
Thu Nov 24 22:06:23 2005
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
-import org.apache.policy.util.PolicyRegistry;
+import org.apache.ws.policy.util.PolicyRegistry;
/**
* Assertion is an interface which all constructs of policy must implements. It
Modified:
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/model/CompositeAssertion.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/CompositeAssertion.java
Thu Nov 24 22:06:23 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
import java.util.ArrayList;
import java.util.Iterator;
Modified:
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/model/Policy.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java
(original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java
Thu Nov 24 22:06:23 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.policy.util.PolicyRegistry;
+import org.apache.ws.policy.util.PolicyRegistry;
/**
* Policy is the access point for policy framework. It the object model that
Modified:
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/model/PolicyConstants.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyConstants.java
Thu Nov 24 22:06:23 2005
@@ -1,4 +1,4 @@
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
Modified:
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/model/PolicyReference.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PolicyReference.java
Thu Nov 24 22:06:23 2005
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
-import org.apache.policy.util.PolicyRegistry;
+import org.apache.ws.policy.util.PolicyRegistry;
/**
* PolicyReference class has implicit reference to a external policy. It acts
Modified:
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/model/PrimitiveAssertion.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java
Thu Nov 24 22:06:23 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -22,8 +22,8 @@
import javax.xml.namespace.QName;
-import org.apache.policy.util.PolicyRegistry;
-import org.apache.policy.util.PolicyUtil;
+import org.apache.ws.policy.util.PolicyRegistry;
+import org.apache.ws.policy.util.PolicyUtil;
/**
* PrimitiveAssertion wraps an assertion which is indivisible. Such assertion
Modified:
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/model/XorCompositeAssertion.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java
Thu Nov 24 22:06:23 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.apache.policy.model;
+package org.apache.ws.policy.model;
import java.util.Iterator;
-import org.apache.policy.util.PolicyRegistry;
+import org.apache.ws.policy.util.PolicyRegistry;
/**
* XORCompositeAssertion represents a bunch of policy alternatives. It requires
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=348885&r1=348880&r2=348885&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
Thu Nov 24 22:06:23 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -31,9 +31,9 @@
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
-import org.apache.policy.model.Assertion;
-import org.apache.policy.model.Policy;
-import org.apache.policy.model.PolicyConstants;
+import org.apache.ws.policy.model.Assertion;
+import org.apache.ws.policy.model.Policy;
+import org.apache.ws.policy.model.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/PolicyFactory.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyFactory.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyFactory.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/PolicyFactory.java
Thu Nov 24 22:06:23 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
/**
* @author Sanka Samaranayake ([EMAIL PROTECTED])
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=348885&r1=348880&r2=348885&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
Thu Nov 24 22:06:23 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
import java.io.InputStream;
@@ -32,13 +32,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.policy.model.AndCompositeAssertion;
-import org.apache.policy.model.Assertion;
-import org.apache.policy.model.Policy;
-import org.apache.policy.model.PolicyReference;
-import org.apache.policy.model.PrimitiveAssertion;
-import org.apache.policy.model.PolicyConstants;
-import org.apache.policy.model.XorCompositeAssertion;
+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;
/**
* @author Sanka Samaranayake ([EMAIL PROTECTED])
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=348885&r1=348880&r2=348885&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
Thu Nov 24 22:06:23 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.policy.model.Policy;
+import org.apache.ws.policy.model.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=348885&r1=348880&r2=348885&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
Thu Nov 24 22:06:23 2005
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
import java.util.Iterator;
import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.policy.model.AndCompositeAssertion;
-import org.apache.policy.model.Policy;
-import org.apache.policy.model.PrimitiveAssertion;
-import org.apache.policy.model.XorCompositeAssertion;
+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;
/**
* 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=348885&r1=348880&r2=348885&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
Thu Nov 24 22:06:23 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
import java.io.OutputStream;
@@ -27,13 +27,13 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.policy.model.AndCompositeAssertion;
-import org.apache.policy.model.Assertion;
-import org.apache.policy.model.Policy;
-import org.apache.policy.model.PolicyConstants;
-import org.apache.policy.model.PolicyReference;
-import org.apache.policy.model.PrimitiveAssertion;
-import org.apache.policy.model.XorCompositeAssertion;
+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;
/**
* @author Sanka Samaranayake ([EMAIL PROTECTED])
Modified:
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StringUtils.java
URL:
http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StringUtils.java?rev=348885&r1=348880&r2=348885&view=diff
==============================================================================
---
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StringUtils.java
(original)
+++
webservices/commons/trunk/policy/src/org/apache/ws/policy/util/StringUtils.java
Thu Nov 24 22:06:23 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.policy.util;
+package org.apache.ws.policy.util;
/**
* StringUtils provides few utility functions for other classes in the
