Moving 2.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835137 13f79535-47bb-0310-9956-ffa450edef68

48 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/META-INF/MANIFEST.MF
index 3a43caa6e4..3a43caa6e4 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/NOTICE
index db5ab284d5..db5ab284d5 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/pom.xml
index a3188b0801..a3188b0801 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 2b3e087e52..2b3e087e52 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
index 4ccaf57c19..4ccaf57c19 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
index 4b5fffff01..4b5fffff01 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
index aa9cd50abc..aa9cd50abc 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index deb4221f4f..deb4221f4f 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
index 566cd6e1a5..566cd6e1a5 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/META-INF/MANIFEST.MF
index 147f17e4a1..147f17e4a1 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/NOTICE
index e158aa1bfd..e158aa1bfd 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/pom.xml
index 976177f5b8..976177f5b8 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 3ffe893553..3ffe893553 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
index 2ccb192fdb..2ccb192fdb 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index fc958afad5..fc958afad5 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 41e2377db5..41e2377db5 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 762fcad7aa..762fcad7aa 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
index 4d38cb8afe..4d38cb8afe 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
index 7a461a5773..7a461a5773 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index f05c11f9b6..f05c11f9b6 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index 7070d33f2c..7070d33f2c 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index bfeeac5696..bfeeac5696 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
index e6ccb22ed5..e6ccb22ed5 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index 08b2ac2c3f..08b2ac2c3f 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index 209a30b08e..209a30b08e 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
index 993f6c6338..993f6c6338 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index aebd6cd3de..aebd6cd3de 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index b5f26c7a34..b5f26c7a34 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
index 975a7692ab..975a7692ab 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
index d052d6b10f..d052d6b10f 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
index 77f6f3e8db..77f6f3e8db 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
index 8d3630baa4..8d3630baa4 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
index be22b6fb13..be22b6fb13 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
index 4e5a05d522..4e5a05d522 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
index 52d7cb59b2..52d7cb59b2 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index c0aac21596..c0aac21596 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
index 9758cba3b4..9758cba3b4 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
index 0a5f4d6442..0a5f4d6442 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
index 7a2f680d16..7a2f680d16 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
index 7920fdf4f4..7920fdf4f4 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
index f1ed50c5f2..f1ed50c5f2 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
index 6a1ba4d7ba..6a1ba4d7ba 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
index 4def8a5227..4def8a5227 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
index 2f0c34df7d..2f0c34df7d 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
diff --git a/branches/sca-java-2.0-M4/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface
index 12991071e5..12991071e5 100644
--- a/branches/sca-java-2.0-M4/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface