summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.4/modules/extensibility
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:08:29 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:08:29 +0000
commit725006d4c47e63986ac042ade23a4d193298b1fe (patch)
treeecb2465ddee739a48032ac5c7fa0311e4d90f309 /sca-java-1.x/branches/sca-java-1.4/modules/extensibility
parent61c9466ff91ca40f4b1ebbe670d7848e521131d7 (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835131 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE (renamed from branches/sca-java-1.4/modules/extensibility-equinox/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE (renamed from branches/sca-java-1.4/modules/extensibility-equinox/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml (renamed from branches/sca-java-1.4/modules/extensibility-equinox/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java (renamed from branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java (renamed from branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java (renamed from branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java (renamed from branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java (renamed from branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar (renamed from branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar)bin1797 -> 1797 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE (renamed from branches/sca-java-1.4/modules/extensibility-osgi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE (renamed from branches/sca-java-1.4/modules/extensibility-osgi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml (renamed from branches/sca-java-1.4/modules/extensibility-osgi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java (renamed from branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java (renamed from branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java (renamed from branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar (renamed from branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar)bin1797 -> 1797 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/LICENSE (renamed from branches/sca-java-1.4/modules/extensibility/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/NOTICE (renamed from branches/sca-java-1.4/modules/extensibility/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/pom.xml (renamed from branches/sca-java-1.4/modules/extensibility/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java (renamed from branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint (renamed from branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint (renamed from branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java (renamed from branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java)0
33 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/LICENSE
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE
index 65c52d01c7..65c52d01c7 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/NOTICE
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml
index d3b956672d..d3b956672d 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/pom.xml
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 5ab5a66077..5ab5a66077 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
index 1cb1d09f8d..1cb1d09f8d 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
index 7602b02488..7602b02488 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index 3126365748..3126365748 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
index e000faa447..e000faa447 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
Binary files differ
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE
index 65c52d01c7..65c52d01c7 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml
index b09efdf8ce..b09efdf8ce 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
index a536684b2e..a536684b2e 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
index 208ef1a74f..208ef1a74f 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
index aba7e62637..aba7e62637 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility-osgi/src/test/resources/test-bundle.jar
Binary files differ
diff --git a/branches/sca-java-1.4/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/modules/extensibility/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/LICENSE
diff --git a/branches/sca-java-1.4/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.4/modules/extensibility/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/NOTICE
diff --git a/branches/sca-java-1.4/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/pom.xml
index be3ed67921..be3ed67921 100644
--- a/branches/sca-java-1.4/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/pom.xml
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 48f240559c..48f240559c 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index 8ca030c0dd..8ca030c0dd 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 6f7c83c8d9..6f7c83c8d9 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index f2f67b2d52..f2f67b2d52 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index dbfd0dcd90..dbfd0dcd90 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index ec0f12b8ba..ec0f12b8ba 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index 6b14b95666..6b14b95666 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index da3a12732d..da3a12732d 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index 403b6aa7a7..403b6aa7a7 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index 1722cd5f49..1722cd5f49 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index ce41a44068..ce41a44068 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
index 42bad63132..42bad63132 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
index d769bad283..d769bad283 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index fd508402fc..fd508402fc 100644
--- a/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java