Remove the dependency on o.a.t.s.policy.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@706751 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 6 insertions, 8 deletions

diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
index 1faeb3e03b..1b0813a0d8 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.policy.xml.ws;
 
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
 import javax.xml.namespace.QName;
@@ -41,7 +40,6 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.xml.PolicyConstants;
 
 
 /**
@@ -49,9 +47,9 @@ import org.apache.tuscany.sca.policy.xml.PolicyConstants;
  *
  * @version $Rev$ $Date$
  */
-public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<org.apache.neethi.Policy>, PolicyConstants {
-	public final static String WS_POLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
-	public final static String WS_POLICY = "Policy";
+public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<org.apache.neethi.Policy> {
+    public final static String WS_POLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    public final static String WS_POLICY = "Policy";
 	
     public final static QName WS_POLICY_QNAME =new QName(WS_POLICY_NS, WS_POLICY);
 
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
index b887257efe..57e3fe8d3a 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.policy.xml;
+package org.apache.tuscany.sca.policy.xml.ws;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
index 3e24d3661c..cb5db57c15 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.policy.xml;
+package org.apache.tuscany.sca.policy.xml.ws;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java b/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index 13b3c44521..b0aa1ed905 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
+++ b/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.policy.xml;
+package org.apache.tuscany.sca.policy.xml.ws;
 
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;