Author: slaws
Date: Fri Feb 12 16:28:40 2010
New Revision: 909492
URL: http://svn.apache.org/viewvc?rev=909492&view=rev
Log:
Move securityIdentity policy into Tuscany namespace
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.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/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/identity/SecurityIdentityPolicy.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java?rev=909492&r1=909491&r2=909492&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
Fri Feb 12 16:28:40 2010
@@ -21,14 +21,15 @@
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;
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=909492&r1=909491&r2=909492&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
Fri Feb 12 16:28:40 2010
@@ -21,7 +21,6 @@
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
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=909492&r1=909491&r2=909492&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
Fri Feb 12 16:28:40 2010
@@ -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 -->
