105 files changed, 0 insertions, 0 deletions
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/policy-security/META-INF/MANIFEST.MF
index 593060a130..593060a130 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/policy-security/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-security/pom.xml
index af2d8926a0..af2d8926a0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index 152a8de6cc..152a8de6cc 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index 43db3ec9be..43db3ec9be 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 348934bd6c..348934bd6c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
index 3ab9cb656d..3ab9cb656d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index 9d3b6e75f8..9d3b6e75f8 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index 5aa36ecc89..5aa36ecc89 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 0d11825186..0d11825186 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index aae0386589..aae0386589 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
index 147b863c01..147b863c01 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index dfb6fee180..dfb6fee180 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index d78c0fc2e3..d78c0fc2e3 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
index 1f48b3b30a..1f48b3b30a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index aa52e0bc41..aa52e0bc41 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index e4c4794c52..e4c4794c52 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index 0ccda91364..0ccda91364 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
index a20f314a2a..a20f314a2a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
index b58b9bb874..b58b9bb874 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index 1297b44b93..1297b44b93 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 185982a749..185982a749 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 41a7b62772..41a7b62772 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index e1ef32f36c..e1ef32f36c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index edff316700..edff316700 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index 209cb4c7b7..209cb4c7b7 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index 48a42eb711..48a42eb711 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bf8e4d11b4..bf8e4d11b4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 0363fbd981..0363fbd981 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index f8f0634a9a..f8f0634a9a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index 91383eaf6a..91383eaf6a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index ebb47f2b60..ebb47f2b60 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 31b829556b..31b829556b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/META-INF/MANIFEST.MF
index d11dc08764..d11dc08764 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/pom.xml
index c1c9d6fa2b..c1c9d6fa2b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
index 1b0813a0d8..1b0813a0d8 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2e11e31fec..2e11e31fec 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
index 57e3fe8d3a..57e3fe8d3a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
index cb5db57c15..cb5db57c15 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index b0aa1ed905..b0aa1ed905 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 814476b4f9..814476b4f9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/META-INF/MANIFEST.MF
index 3e5ce44e75..3e5ce44e75 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/pom.xml
index 7ab513c6cc..7ab513c6cc 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index ae6805c832..ae6805c832 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index e405da21c7..e405da21c7 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index a85ef28572..a85ef28572 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 3f69df05d8..3f69df05d8 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 03cd635596..03cd635596 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 93a8433d65..93a8433d65 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index d0b19af129..d0b19af129 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index 50d8cb06e2..50d8cb06e2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index e928ead4c6..e928ead4c6 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index c41a0cd01f..c41a0cd01f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 4daf46c790..4daf46c790 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
index 40107bb11e..40107bb11e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 72235812a1..72235812a1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index 2dc8a1cdc7..2dc8a1cdc7 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b51a6fba98..b51a6fba98 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/policy/META-INF/MANIFEST.MF
index ce038e7d05..ce038e7d05 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/policy/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/policy/pom.xml
index 554877d893..554877d893 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index 6ca4fe72ec..6ca4fe72ec 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index 22f328f643..22f328f643 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index bf2cfca924..bf2cfca924 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index 6db529c7f0..6db529c7f0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index ee67006875..ee67006875 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 1b225bc918..1b225bc918 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index c6393e2ada..c6393e2ada 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index 65c39803d2..65c39803d2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 49bcbae1ae..49bcbae1ae 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index b16072c214..b16072c214 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index f4156fc2e6..f4156fc2e6 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index caa0d04fe3..caa0d04fe3 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index 28ff9d09d3..28ff9d09d3 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 0f43221dd6..0f43221dd6 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 0f8b1ae00a..0f8b1ae00a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 7861fd79f9..7861fd79f9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index aa6e27c240..aa6e27c240 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 2d6bd0eb6f..2d6bd0eb6f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index a0e2f10f56..a0e2f10f56 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 179a10cc1a..179a10cc1a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 98a116fe7b..98a116fe7b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index e5002d2cdc..e5002d2cdc 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index d6f65b1788..d6f65b1788 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 2e4c6a9d78..2e4c6a9d78 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index 1f91710f95..1f91710f95 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
index e9af4912a3..e9af4912a3 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index c80e68a0be..c80e68a0be 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
index 6d6420017f..6d6420017f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index eb97818042..eb97818042 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index afb3c035ae..afb3c035ae 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/sca-java-1.x/tags/2.0-M1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 2775c4ac71..2775c4ac71 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java