Changes to make policy-security work in 2.0.

SecurityUtil.java moved to org.apache.tuscany.policy.security to avoid a clash with a package name used in the policy module

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

5 files changed, 6 insertions, 5 deletions

diff --git a/java/sca/modules/policy-security/META-INF/MANIFEST.MF b/java/sca/modules/policy-security/META-INF/MANIFEST.MF
index 7fa44bee8c..d36fe873a1 100644
--- a/java/sca/modules/policy-security/META-INF/MANIFEST.MF
+++ b/java/sca/modules/policy-security/META-INF/MANIFEST.MF
@@ -25,7 +25,8 @@ Export-Package: org.apache.tuscany.sca.policy.authorization;uses:="jav
  es:="javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,or

  g.apache.tuscany.sca.contribution.processor,org.apache.tuscany.sca.co

  re,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.policy,javax

- .xml.namespace";version="1.4"

+ .xml.namespace";version="1.4",org.apache.tuscany.sca.policy.authentic

+ ation.token;version="1.4"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany Security Policy Model

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index 8c06f0e6a5..9d3b6e75f8 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
+import org.apache.tuscany.sca.policy.security.SecurityUtil;
 
 /**
  *
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 3ea3381616..0d11825186 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
+import org.apache.tuscany.sca.policy.security.SecurityUtil;
 
 
 /**
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
index df7a9c307b..4a711fac45 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
@@ -26,7 +26,7 @@ import javax.security.auth.Subject;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.SecurityUtil;
+import org.apache.tuscany.sca.policy.security.SecurityUtil;
 import org.osoa.sca.ServiceRuntimeException;
 
 /**
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index 81bc3271c6..1297b44b93 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.policy;
+package org.apache.tuscany.sca.policy.security;
 
 import java.security.Principal;