TUSCANY-3949 = Applying Vijai's patch to correct policy namespaces + some extra fixes to correct the associated test case.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 653f6d621c..4eb0f3284c 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
@@ -31,6 +31,7 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy;
@@ -44,7 +45,7 @@ import org.junit.Test;
  * @version $Rev$ $Date$
  */
 public class PolicyProcessorTestCase {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
+   
     private final static List<String> SEQ =
         Arrays.asList("permitAll",
                       "allow [r1, r2]",
@@ -62,10 +63,10 @@ public class PolicyProcessorTestCase {
         Map<QName, StAXArtifactProcessor> processors = new HashMap<QName, StAXArtifactProcessor>();
         processors.put(AuthorizationPolicy.NAME, new AuthorizationPolicyProcessor(null));
         processors.put(SecurityIdentityPolicy.NAME, new SecurityIdentityPolicyProcessor(null));
-        processors.put(new QName(SCA11_NS, "allow"), new AuthorizationPolicyProcessor(null));
-        processors.put(new QName(SCA11_NS, "permitAll"), new AuthorizationPolicyProcessor(null));
-        processors.put(new QName(SCA11_NS, "denyAll"), new AuthorizationPolicyProcessor(null));
-        processors.put(new QName(SCA11_NS, "runAs"), new SecurityIdentityPolicyProcessor(null));
+        processors.put(new QName(Constants.SCA11_TUSCANY_NS, "allow"), new AuthorizationPolicyProcessor(null));
+        processors.put(new QName(Constants.SCA11_TUSCANY_NS, "permitAll"), new AuthorizationPolicyProcessor(null));
+        processors.put(new QName(Constants.SCA11_TUSCANY_NS, "denyAll"), new AuthorizationPolicyProcessor(null));
+        processors.put(new QName(Constants.SCA11_TUSCANY_NS, "runAs"), new SecurityIdentityPolicyProcessor(null));
         InputStream is = getClass().getResourceAsStream("mock_policy_definitions.xml");
         XMLInputFactory factory = XMLInputFactory.newInstance();
         XMLStreamReader reader = factory.createXMLStreamReader(is);