From 1876c96e45185ec0b48d7b19b30fe29d903f5c37 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 11 Dec 2009 08:26:48 +0000 Subject: TUSCANY-3388 - Updating to the latests OASIS schema git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@889531 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/policy/authorization/AuthorizationPolicy.java | 2 +- .../tuscany/sca/policy/identity/SecurityIdentityPolicy.java | 2 +- ....tuscany.sca.contribution.processor.StAXArtifactProcessor | 12 ++++++------ .../org/apache/tuscany/sca/policy/security/definitions.xml | 6 +++--- .../tuscany/sca/policy/security/tuscany_definitions.xml | 4 ++-- .../tuscany/sca/policy/security/PolicyProcessorTestCase.java | 2 +- .../tuscany/sca/policy/security/mock_policy_definitions.xml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'sca-java-2.x/trunk/modules/policy-security/src') diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java index 8b0bbd54ff..c970704929 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java @@ -30,7 +30,7 @@ import javax.xml.namespace.QName; * @version $Rev$ $Date$ */ public class AuthorizationPolicy { - private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; + 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"); 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 28ffcaf348..4a7e330a57 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 @@ -27,7 +27,7 @@ import javax.xml.namespace.QName; * @version $Rev$ $Date$ */ public class SecurityIdentityPolicy { - private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; + 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"); 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 cb284822ac..473c17f6ff 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 @@ -16,12 +16,12 @@ # under the License. # Implementation class for the artifact processor extension -org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#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/200903#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/200903#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/200903#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/200903#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/200903#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy +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.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/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml index 9a02731e8d..21923b3a3b 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml @@ -17,9 +17,9 @@ * specific language governing permissions and limitations * under the License. --> - diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml index f3af5bc964..45d4ebaf5e 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> - + All invocations are must have an identity set 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 0d8a5d5a9c..653f6d621c 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 @@ -44,7 +44,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/200903"; + private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; private final static List SEQ = Arrays.asList("permitAll", "allow [r1, r2]", 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 acb47de243..c3ae568ee8 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,8 @@ * specific language governing permissions and limitations * under the License. --> - + -- cgit v1.2.3