Move securityIdentity policy into Tuscany namespace

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

3 files changed, 14 insertions, 12 deletions

diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 4a7e330a57..e4c24168c5 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
@@ -21,14 +21,15 @@ package org.apache.tuscany.sca.policy.identity;
 
 import javax.xml.namespace.QName;
 
+import org.apache.tuscany.sca.assembly.xml.Constants;
+
 /**
  * Models the SCA Implementation Security Policy Assertion for Security Identity.
  * 
  * @version $Rev$ $Date$
  */
-public class SecurityIdentityPolicy {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";    
-    public static final QName NAME = new QName(SCA11_NS, "securityIdentity");
+public class SecurityIdentityPolicy { 
+    public static final QName NAME = new QName(Constants.SCA11_TUSCANY_NS, "securityIdentity");
 
     private boolean useCallerIdentity;
 
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 473c17f6ff..d08e2e25e5 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -21,7 +21,6 @@ org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=h
 org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

 org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

 org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

 org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

 org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy

 org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#basicAuthentication,model=org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy

diff --git a/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index c3ae568ee8..91ab004a7e 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
@@ -17,8 +17,10 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- POLICY SETS -->
     <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
@@ -43,16 +45,16 @@
 
     <!-- POLICY SETS -->
     <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
+        <tuscany:securityIdentity>
+            <tuscany:runAs role="admin" />
+        </tuscany:securityIdentity>
     </policySet>
 
     <!-- POLICY SETS -->
     <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
+        <tuscany:securityIdentity>
+            <tuscany:useCallerIdentity />
+        </tuscany:securityIdentity>
     </policySet>
 
     <!-- POLICY SETS -->