332 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/.project b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/.project
index 762ebae4a1..762ebae4a1 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/.project
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/.project
diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/feature.xml
index d680744c1e..d680744c1e 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/features/core/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/pom.xml
index 165cbedbb5..165cbedbb5 100644
--- a/branches/sca-java-1.4/tools/eclipse/features/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/features/core/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/.project b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/.project
index 6fc647ac07..6fc647ac07 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/.project
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/.project
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
index 3096b99e66..3096b99e66 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
index 700d056838..700d056838 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/t.gif b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/t.gif
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/t.gif
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/tuscany.gif b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/tuscany.gif
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
index 81ba746fd5..81ba746fd5 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
index c1a674a46a..c1a674a46a 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
index c82281b243..c82281b243 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
index 21f6f27a6f..21f6f27a6f 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
index df73402b67..df73402b67 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
index bd255f4a15..bd255f4a15 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
index c9b96c7031..c9b96c7031 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
index ddcfb66b63..ddcfb66b63 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 738fe2638e..738fe2638e 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
index 895cde6922..895cde6922 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
index c5aeefb891..c5aeefb891 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
index 94ab29ce9a..94ab29ce9a 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
index 3bbdc81dde..3bbdc81dde 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
index 09b800fe1b..09b800fe1b 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
index 53b9607159..53b9607159 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
index f07f0b643c..f07f0b643c 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
index bbca96196d..bbca96196d 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/plugin.xml
index 97c1d86623..97c1d86623 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/pom.xml
index 2d00c0f98c..2d00c0f98c 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/pom.xml
index d117d06b09..d117d06b09 100644
--- a/branches/sca-java-1.4/tools/eclipse/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/site/updatesite/.project b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/.project
index fd6959f412..fd6959f412 100644
--- a/branches/sca-java-1.4/tools/eclipse/site/updatesite/.project
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/.project
diff --git a/branches/sca-java-1.4/tools/eclipse/site/updatesite/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse/site/updatesite/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse/site/updatesite/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse/site/updatesite/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/pom.xml
index eac1cf611d..eac1cf611d 100644
--- a/branches/sca-java-1.4/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/site.xml
index 74708b3f61..74708b3f61 100644
--- a/branches/sca-java-1.4/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/site.xml
diff --git a/branches/sca-java-1.4/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index 1ba06af971..1ba06af971 100644
--- a/branches/sca-java-1.4/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/core/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/core/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/core/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/core/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/core/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/feature.xml
index 5c01655551..5c01655551 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/core/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/core/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/pom.xml
index 6125ee619a..6125ee619a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/core/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/ejava/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/ejava/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
index f363ae7b2a..f363ae7b2a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/ejava/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/ejava/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/ejava/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/ejava/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/ejava/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/feature.xml
index 92543ee34a..92543ee34a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/ejava/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/ejava/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/pom.xml
index cebdda5e43..cebdda5e43 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/ejava/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/ejava/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/manager/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/manager/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/manager/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
index 8d8f5b271d..8d8f5b271d 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/manager/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/manager/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/manager/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/manager/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/manager/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/feature.xml
index 503f80317e..503f80317e 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/manager/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/manager/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/pom.xml
index 10fe324f98..10fe324f98 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/manager/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/process/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/process/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/process/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/META-INF/MANIFEST.MF
index 7f10d43405..7f10d43405 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/process/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/process/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/process/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/process/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/process/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/process/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/feature.xml
index d167bd4940..d167bd4940 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/process/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/process/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/pom.xml
index a486b4f68b..a486b4f68b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/process/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/process/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/web20/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/web20/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/web20/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
index 2dc129ebaa..2dc129ebaa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/web20/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/web20/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/web20/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/web20/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/web20/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/feature.xml
index 308948ece1..308948ece1 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/web20/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/web20/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/pom.xml
index f45d2bf55d..f45d2bf55d 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/web20/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/web20/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/webservice/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/webservice/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
index 9fb9f1282b..9fb9f1282b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/webservice/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/webservice/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/webservice/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/webservice/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/webservice/feature.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/feature.xml
index dfbb90fcf0..dfbb90fcf0 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/webservice/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/feature.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/features/webservice/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/pom.xml
index 763c794925..763c794925 100644
--- a/branches/sca-java-1.4/tools/eclipse34/features/webservice/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/features/webservice/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
index 0d8b1053bf..0d8b1053bf 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
index 6b6d79d45b..6b6d79d45b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/t.gif b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/t.gif
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/t.gif
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/tuscany.gif b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/tuscany.gif
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
index ee9a3d2de9..ee9a3d2de9 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
index 7ea8d700f7..7ea8d700f7 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
index 70e794d2ce..70e794d2ce 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
index bbe10b28fe..bbe10b28fe 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
index 883c7c0781..883c7c0781 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
index f90483a00d..f90483a00d 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
index 4830268272..4830268272 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
index 18850d9333..18850d9333 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
index 909290859a..909290859a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
index 060f6ff6cb..060f6ff6cb 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
index edbe4b3e69..edbe4b3e69 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
index 056deb5b27..056deb5b27 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 5f8ea73db4..5f8ea73db4 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
index f66fa71191..f66fa71191 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
index 6eba5ffdc2..6eba5ffdc2 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
index 2a4c7206db..2a4c7206db 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
index 5fc1a75960..5fc1a75960 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
index 702da9701e..702da9701e 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
index a1c6cb86a7..a1c6cb86a7 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
index 5e059308e6..5e059308e6 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
index 5d9f2bdf70..5d9f2bdf70 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/plugin.xml
index edc17c5ee2..edc17c5ee2 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/pom.xml
index 13850ecc91..13850ecc91 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/src/main/assembly/jar.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
index 7832ba5131..7832ba5131 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
index fb238f04b1..fb238f04b1 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
index 69c6cdece0..69c6cdece0 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
index 9b7c199c79..9b7c199c79 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/plugin.xml
index fef1afe0b9..fef1afe0b9 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/pom.xml
index feea8f3d44..feea8f3d44 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/ejava/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
index 2a70682fae..2a70682fae 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
index 6c2075561b..6c2075561b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
index 9c7df0f488..9c7df0f488 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/plugin.xml
index 2e09146dfd..2e09146dfd 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/pom.xml
index 8f857e8a9f..8f857e8a9f 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/manager/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
index 0acd32e51c..0acd32e51c 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
index 90be31d2f2..90be31d2f2 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
index dab0eeaadc..dab0eeaadc 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/plugin.xml
index 3e5f87f634..3e5f87f634 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/process/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/pom.xml
index 88681039f6..88681039f6 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/process/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/process/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
index 3c2816ec4b..3c2816ec4b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
index cd47cc9d1d..cd47cc9d1d 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
index 96026db08e..96026db08e 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/plugin.xml
index 6bf9087474..6bf9087474 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/pom.xml
index 0797d6259b..0797d6259b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/web20/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/web20/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
index 9d83fd9b6b..9d83fd9b6b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/build.properties b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/build.properties
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
index 794d8ed28b..794d8ed28b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
index 6310209c3a..6310209c3a 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/plugin.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/plugin.xml
index 1fd46d3e75..1fd46d3e75 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/plugin.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/pom.xml
index 501771b7ab..501771b7ab 100644
--- a/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/plugins/webservice/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/pom.xml
index e1e2ca702f..e1e2ca702f 100644
--- a/branches/sca-java-1.4/tools/eclipse34/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/LICENSE
diff --git a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/NOTICE
diff --git a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/etc/generate-p2.sh b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/etc/generate-p2.sh
index ea2eb865f4..ea2eb865f4 100755
--- a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/etc/generate-p2.sh
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/etc/generate-p2.sh
diff --git a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/pom.xml
index e9cb6b4da1..e9cb6b4da1 100644
--- a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/pom.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/site.xml
index a72099867d..a72099867d 100644
--- a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/site.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/site.xml
diff --git a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
index c1225e320b..c1225e320b 100644
--- a/branches/sca-java-1.4/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-java-1.4/tools/java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/LICENSE
diff --git a/branches/sca-java-1.4/tools/java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/NOTICE
diff --git a/branches/sca-java-1.4/tools/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/pom.xml
index 58685416f4..58685416f4 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/pom.xml
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index 60afe70534..60afe70534 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index a890dd624d..a890dd624d 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 9c8ff9df9e..9c8ff9df9e 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index bce30a48d3..bce30a48d3 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 897700ffd9..897700ffd9 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index fd10c77f8b..fd10c77f8b 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index 18cfafa4e3..18cfafa4e3 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index 3750dc27f5..3750dc27f5 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index d6cd8a7f57..d6cd8a7f57 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index 03291428a2..03291428a2 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index cb41c56b94..cb41c56b94 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index 66c9100ef9..66c9100ef9 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index e30ada3af5..e30ada3af5 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index 135b374357..135b374357 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index dfebd77215..dfebd77215 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
index 5406025643..5406025643 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index c587252d23..c587252d23 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index bf49d98888..bf49d98888 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index cf83095852..cf83095852 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index 901da8e551..901da8e551 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index 78a64dcc64..78a64dcc64 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/maven/maven-ant-generator/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/maven/maven-ant-generator/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/pom.xml
index c2c4538637..c2c4538637 100644
--- a/branches/sca-java-1.4/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index 202b3c3cec..202b3c3cec 100644
--- a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/README b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/README
index d53760029f..d53760029f 100644
--- a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/README
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/README
diff --git a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/pom.xml
index 00abe5dd56..00abe5dd56 100644
--- a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
index b904ac4804..b904ac4804 100644
--- a/branches/sca-java-1.4/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-incremental-build/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/maven/maven-incremental-build/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-incremental-build/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/maven/maven-incremental-build/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-incremental-build/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/pom.xml
index 9e1ce9feaa..9e1ce9feaa 100644
--- a/branches/sca-java-1.4/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
index 3a6870732b..3a6870732b 100644
--- a/branches/sca-java-1.4/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/pom.xml
index 10f505c0de..10f505c0de 100644
--- a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
index 620e32a6fd..620e32a6fd 100644
--- a/branches/sca-java-1.4/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/pom.xml
index 641bf44d55..641bf44d55 100644
--- a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
index a2251a6a2a..a2251a6a2a 100644
--- a/branches/sca-java-1.4/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/pom.xml
index 3655bae51d..3655bae51d 100644
--- a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
index 5fbd3008d2..5fbd3008d2 100644
--- a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
index ed4ac63533..ed4ac63533 100644
--- a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
index 79b0db4223..79b0db4223 100644
--- a/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-web-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/tools/maven/maven-web-junit/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-web-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/tools/maven/maven-web-junit/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-web-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/pom.xml
index bb45da4738..bb45da4738 100644
--- a/branches/sca-java-1.4/tools/maven/maven-web-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
index d1afe2c995..d1afe2c995 100644
--- a/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
index 658d65d7c3..658d65d7c3 100644
--- a/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/LICENSE
diff --git a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/NOTICE
diff --git a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/pom.xml
index ece4bd324c..ece4bd324c 100644
--- a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/pom.xml
diff --git a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
index 8021692521..8021692521 100644
--- a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
diff --git a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
index cc10c351b1..cc10c351b1 100644
--- a/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
diff --git a/branches/sca-java-1.4/tools/maven/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/maven/pom.xml
index da16e87bf9..da16e87bf9 100644
--- a/branches/sca-java-1.4/tools/maven/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/maven/pom.xml
diff --git a/branches/sca-java-1.4/tools/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/pom.xml
index 3f3bcd474b..3f3bcd474b 100644
--- a/branches/sca-java-1.4/tools/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/pom.xml
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/LICENSE
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/NOTICE
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/pom.xml
index 4cec8b0ce6..4cec8b0ce6 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/pom.xml
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
index ff32d1b48f..ff32d1b48f 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
index 283d5e3df9..283d5e3df9 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
index 26080b2e12..26080b2e12 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
index 8001ab7818..8001ab7818 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
index 0710b670cd..0710b670cd 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
diff --git a/branches/sca-java-1.4/tools/runtime-inspector/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.4/tools/runtime-inspector/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/runtime-inspector/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.4/tools/wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/LICENSE
diff --git a/branches/sca-java-1.4/tools/wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/NOTICE
diff --git a/branches/sca-java-1.4/tools/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/pom.xml
index 08d7035f06..08d7035f06 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/pom.xml
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index 08c7131208..08c7131208 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 8e0c3683a3..8e0c3683a3 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index 0c4f42633a..0c4f42633a 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 4ab152fb90..4ab152fb90 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index f6d1f3a64a..f6d1f3a64a 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index 43005bcdbc..43005bcdbc 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index 92581d6ac2..92581d6ac2 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
index dda5a36085..dda5a36085 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-1.4/tools/wsdl2java/src/test/resources/sequences.xsd