summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/LICENSE (renamed from branches/sca-java-2.0-M4/modules/policy-security/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M4/modules/policy-security/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/NOTICE (renamed from branches/sca-java-2.0-M4/modules/policy-security/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/pom.xml (renamed from branches/sca-java-2.0-M4/modules/policy-security/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml (renamed from branches/sca-java-2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml)0
35 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/META-INF/MANIFEST.MF
index 2a4e4b3205..2a4e4b3205 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/pom.xml
index 42376981df..42376981df 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index c735f63b7d..c735f63b7d 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index 3df06c1e00..3df06c1e00 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 9b894101ef..9b894101ef 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
index 3ab9cb656d..3ab9cb656d 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index 189866a23f..189866a23f 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index d4d8e59429..d4d8e59429 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 39f70c7e78..39f70c7e78 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index b640ec60e5..b640ec60e5 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
index 147b863c01..147b863c01 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index 8b0bbd54ff..8b0bbd54ff 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index 8a65a10560..8a65a10560 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
index 773c874a90..773c874a90 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index 2783a37316..2783a37316 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 28ffcaf348..28ffcaf348 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index 3c91b9fbcf..3c91b9fbcf 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
index 80e1494796..80e1494796 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index 1297b44b93..1297b44b93 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 6666469b75..6666469b75 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 247243fcf8..247243fcf8 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index 65d8b5c597..65d8b5c597 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index 16629e4c6b..16629e4c6b 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index b9ab68aa2f..b9ab68aa2f 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index ab1ab1870f..ab1ab1870f 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb284822ac..cb284822ac 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 6c3579dd2e..6c3579dd2e 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d3d8f8e38a..d3d8f8e38a 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 9a02731e8d..9a02731e8d 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index f3af5bc964..f3af5bc964 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index ebb47f2b60..ebb47f2b60 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 0d8a5d5a9c..0d8a5d5a9c 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index acb47de243..acb47de243 100644
--- a/branches/sca-java-2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml