Author: slaws
Date: Mon Sep 19 11:49:28 2011
New Revision: 1172578
URL: http://svn.apache.org/viewvc?rev=1172578&view=rev
Log:
TUSCANY-3949 = Applying Vijai's patch to correct policy namespaces + some extra
fixes to correct the associated test case.
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java?rev=1172578&r1=1172577&r2=1172578&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
Mon Sep 19 11:49:28 2011
@@ -24,15 +24,15 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+
/**
* Models the SCA Implementation Security Policy Assertion for Authorization.
*
* @version $Rev$ $Date$
*/
public class AuthorizationPolicy {
- private final static String SCA11_NS =
"http://docs.oasis-open.org/ns/opencsa/sca/200912";;
- // private final static String SCA10_TUSCANY_NS =
"http://tuscany.apache.org/xmlns/sca/1.1";;
- public static final QName NAME = new QName(SCA11_NS, "authorization");
+ public static final QName NAME = new QName(Constants.SCA11_TUSCANY_NS,
"authorization");
public static enum AcessControl {
permitAll, denyAll, allow
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=1172578&r1=1172577&r2=1172578&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Mon Sep 19 11:49:28 2011
@@ -18,12 +18,10 @@
# Implementation class for the artifact processor extension
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
org.apache.tuscany.sca.policy.security.http.ssl.HTTPSPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#https,model=org.apache.tuscany.sca.policy.security.http.ssl.HTTPSPolicy
-
-# TODO - following processors are old and somewhat questionable for 2.x, needs
reviewing
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#authorization,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#allow,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#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.authorization.AuthorizationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
+org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#runAs,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
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java?rev=1172578&r1=1172577&r2=1172578&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
Mon Sep 19 11:49:28 2011
@@ -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);
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml?rev=1172578&r1=1172577&r2=1172578&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
Mon Sep 19 11:49:28 2011
@@ -24,23 +24,23 @@
<!-- POLICY SETS -->
<policySet name="ps1" provides="authorization"
appliesTo="sca:implementation">
- <authorization>
- <permitAll />
- </authorization>
+ <tuscany:authorization>
+ <tuscany:permitAll />
+ </tuscany:authorization>
</policySet>
<!-- POLICY SETS -->
<policySet name="ps2" provides="authorization"
appliesTo="sca:implementation">
- <authorization>
- <allow roles="r1 r2" />
- </authorization>
+ <tuscany:authorization>
+ <tuscany:allow roles="r1 r2" />
+ </tuscany:authorization>
</policySet>
<!-- POLICY SETS -->
<policySet name="ps3" provides="authorization"
appliesTo="sca:implementation">
- <authorization>
- <denyAll />
- </authorization>
+ <tuscany:authorization>
+ <tuscany:denyAll />
+ </tuscany:authorization>
</policySet>
<!-- POLICY SETS -->
@@ -59,22 +59,22 @@
<!-- POLICY SETS -->
<policySet name="ps6" provides="authorization"
appliesTo="sca:implementation">
- <permitAll />
+ <tuscany:permitAll />
</policySet>
<!-- POLICY SETS -->
<policySet name="ps7" provides="authorization"
appliesTo="sca:implementation">
- <allow roles="r1 r2" />
+ <tuscany:allow roles="r1 r2" />
</policySet>
<!-- POLICY SETS -->
<policySet name="ps8" provides="authorization"
appliesTo="sca:implementation">
- <denyAll />
+ <tuscany:denyAll />
</policySet>
<!-- POLICY SETS -->
<policySet name="ps9" provides="securityIdentity"
appliesTo="sca:implementation">
- <runAs role="admin" />
+ <tuscany:runAs role="admin" />
</policySet>
</definitions>
\ No newline at end of file
