summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/LICENSE (renamed from branches/sca-java-2.0-M3/modules/policy-security/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/policy-security/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/NOTICE (renamed from branches/sca-java-2.0-M3/modules/policy-security/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/pom.xml (renamed from branches/sca-java-2.0-M3/modules/policy-security/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties (renamed from branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java (renamed from branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml (renamed from branches/sca-java-2.0-M3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/LICENSE (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/NOTICE (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/pom.xml (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/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-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (renamed from branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/LICENSE (renamed from branches/sca-java-2.0-M3/modules/policy-xml/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/policy-xml/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/NOTICE (renamed from branches/sca-java-2.0-M3/modules/policy-xml/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/pom.xml (renamed from branches/sca-java-2.0-M3/modules/policy-xml/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/policy-xml/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-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (renamed from branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/LICENSE (renamed from branches/sca-java-2.0-M3/modules/policy/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/policy/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/NOTICE (renamed from branches/sca-java-2.0-M3/modules/policy/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/pom.xml (renamed from branches/sca-java-2.0-M3/modules/policy/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory (renamed from branches/sca-java-2.0-M3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java (renamed from branches/sca-java-2.0-M3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java)0
95 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/META-INF/MANIFEST.MF
index 2a4e4b3205..2a4e4b3205 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/pom.xml
index eb1c9fe315..eb1c9fe315 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/pom.xml
diff --git a/branches/sca-java-2.0-M3/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-M3/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-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index 99a8508ba4..99a8508ba4 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 348934bd6c..348934bd6c 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/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-M3/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-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index ef1e66b7de..ef1e66b7de 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index c5352e1f57..c5352e1f57 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index da4d31a11a..da4d31a11a 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index b8684e29c0..b8684e29c0 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-2.0-M3/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-M3/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-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index 8b0bbd54ff..8b0bbd54ff 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index d78c0fc2e3..d78c0fc2e3 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
index 1f48b3b30a..1f48b3b30a 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index 38feea21b5..38feea21b5 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 28ffcaf348..28ffcaf348 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index 0ccda91364..0ccda91364 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
index a20f314a2a..a20f314a2a 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index 1297b44b93..1297b44b93 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 203d9ca0ab..203d9ca0ab 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 41a7b62772..41a7b62772 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index 179fd0700f..179fd0700f 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index a45ac9b250..a45ac9b250 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index 615e8bf5a3..615e8bf5a3 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index 48a42eb711..48a42eb711 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 24b1e5841d..24b1e5841d 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 6c36975678..6c36975678 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 0363fbd981..0363fbd981 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 84ff597e15..84ff597e15 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index 2881a5a56d..2881a5a56d 100644
--- a/branches/sca-java-2.0-M3/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-M3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index ebb47f2b60..ebb47f2b60 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index a1b790dbb4..a1b790dbb4 100644
--- a/branches/sca-java-2.0-M3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M3/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-M3/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-M3/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-M3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/META-INF/MANIFEST.MF
index a143352a90..a143352a90 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/pom.xml
index d444d1a70a..d444d1a70a 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
index 1b0813a0d8..1b0813a0d8 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2e11e31fec..2e11e31fec 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
index 57e3fe8d3a..57e3fe8d3a 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
index 12a90f5c37..12a90f5c37 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index 907a50984c..907a50984c 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index a2e321068f..a2e321068f 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/META-INF/MANIFEST.MF
index 78cf2f5405..78cf2f5405 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/pom.xml
index 5f25968535..5f25968535 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 38c7b57f12..38c7b57f12 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
index f437b5d599..f437b5d599 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 41e2af3809..41e2af3809 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
index d87921dbbf..d87921dbbf 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 7d63440e23..7d63440e23 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 955788ce8f..955788ce8f 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
index 1b6d64e4f7..1b6d64e4f7 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
index ca44667903..ca44667903 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a64b22dc2a..a64b22dc2a 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 4daf46c790..4daf46c790 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
index d092b5959a..d092b5959a 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
index e954f1ebe4..e954f1ebe4 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 0d0f945e43..0d0f945e43 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index 6887cd1b42..6887cd1b42 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
index 3ade69523c..3ade69523c 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 911833550f..911833550f 100644
--- a/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/policy/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/policy/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/META-INF/MANIFEST.MF
index 1c3482cf56..1c3482cf56 100644
--- a/branches/sca-java-2.0-M3/modules/policy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/policy/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/policy/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/policy/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/pom.xml
index a484ad224d..a484ad224d 100644
--- a/branches/sca-java-2.0-M3/modules/policy/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
index f43c428563..f43c428563 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index e7a93c8907..e7a93c8907 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
index d142015f57..d142015f57 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index b79ccdab78..b79ccdab78 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index efed4bfdb1..efed4bfdb1 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
index ee4f5b5236..ee4f5b5236 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
index a29f214f98..a29f214f98 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 9e7de2f6da..9e7de2f6da 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 2b5b8458d5..2b5b8458d5 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
index 41847bad79..41847bad79 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
index c1862283c7..c1862283c7 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 53c6684d11..53c6684d11 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
index 97fbc19ced..97fbc19ced 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 169ca29833..169ca29833 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 27a77f3ba8..27a77f3ba8 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index 6e2941ff5c..6e2941ff5c 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
index 71e5eef6a7..71e5eef6a7 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index c67ff1eab8..c67ff1eab8 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 75d1229cd8..75d1229cd8 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
index 102bea8d41..102bea8d41 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index fe61ce707c..fe61ce707c 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index eb97818042..eb97818042 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index c8fe89f364..c8fe89f364 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-java-2.0-M3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 2775c4ac71..2775c4ac71 100644
--- a/branches/sca-java-2.0-M3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java