Minor refactoring, renamed eclipse34 to eclipse, moved SDO tools under sdo.

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

203 files changed, 88 insertions, 7 deletions

diff --git a/branches/sca-equinox/tools/eclipse34/features/core/LICENSE b/branches/sca-equinox/tools/eclipse/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/features/core/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/features/core/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/features/core/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/branches/sca-equinox/tools/eclipse34/features/core/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/features/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/features/core/NOTICE b/branches/sca-equinox/tools/eclipse/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/core/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/features/core/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/features/core/build.properties b/branches/sca-equinox/tools/eclipse/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/core/build.properties
+++ b/branches/sca-equinox/tools/eclipse/features/core/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/features/core/feature.xml b/branches/sca-equinox/tools/eclipse/features/core/feature.xml
index 1a20ac1eb1..1a20ac1eb1 100644
--- a/branches/sca-equinox/tools/eclipse34/features/core/feature.xml
+++ b/branches/sca-equinox/tools/eclipse/features/core/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/core/pom.xml b/branches/sca-equinox/tools/eclipse/features/core/pom.xml
index 953eb9ec77..953eb9ec77 100644
--- a/branches/sca-equinox/tools/eclipse34/features/core/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/features/core/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/ejava/LICENSE b/branches/sca-equinox/tools/eclipse/features/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/features/ejava/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/features/ejava/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
index f363ae7b2a..f363ae7b2a 100644
--- a/branches/sca-equinox/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/features/ejava/NOTICE b/branches/sca-equinox/tools/eclipse/features/ejava/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/ejava/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/features/ejava/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/features/ejava/build.properties b/branches/sca-equinox/tools/eclipse/features/ejava/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/ejava/build.properties
+++ b/branches/sca-equinox/tools/eclipse/features/ejava/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/features/ejava/feature.xml b/branches/sca-equinox/tools/eclipse/features/ejava/feature.xml
index ef2ab6c2ba..ef2ab6c2ba 100644
--- a/branches/sca-equinox/tools/eclipse34/features/ejava/feature.xml
+++ b/branches/sca-equinox/tools/eclipse/features/ejava/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/ejava/pom.xml b/branches/sca-equinox/tools/eclipse/features/ejava/pom.xml
index da67d110b7..da67d110b7 100644
--- a/branches/sca-equinox/tools/eclipse34/features/ejava/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/features/ejava/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/manager/LICENSE b/branches/sca-equinox/tools/eclipse/features/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/features/manager/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/features/manager/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/features/manager/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/features/manager/META-INF/MANIFEST.MF
index 8d8f5b271d..8d8f5b271d 100644
--- a/branches/sca-equinox/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/features/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/features/manager/NOTICE b/branches/sca-equinox/tools/eclipse/features/manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/manager/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/features/manager/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/features/manager/build.properties b/branches/sca-equinox/tools/eclipse/features/manager/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/manager/build.properties
+++ b/branches/sca-equinox/tools/eclipse/features/manager/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/features/manager/feature.xml b/branches/sca-equinox/tools/eclipse/features/manager/feature.xml
index 189342993d..189342993d 100644
--- a/branches/sca-equinox/tools/eclipse34/features/manager/feature.xml
+++ b/branches/sca-equinox/tools/eclipse/features/manager/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/manager/pom.xml b/branches/sca-equinox/tools/eclipse/features/manager/pom.xml
index 2e4f221ef1..2e4f221ef1 100644
--- a/branches/sca-equinox/tools/eclipse34/features/manager/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/features/manager/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/process/LICENSE b/branches/sca-equinox/tools/eclipse/features/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/features/process/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/features/process/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/features/process/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/features/process/META-INF/MANIFEST.MF
index 7f10d43405..7f10d43405 100644
--- a/branches/sca-equinox/tools/eclipse34/features/process/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/features/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/features/process/NOTICE b/branches/sca-equinox/tools/eclipse/features/process/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/process/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/features/process/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/features/process/build.properties b/branches/sca-equinox/tools/eclipse/features/process/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/process/build.properties
+++ b/branches/sca-equinox/tools/eclipse/features/process/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/features/process/feature.xml b/branches/sca-equinox/tools/eclipse/features/process/feature.xml
index 08332be61e..08332be61e 100644
--- a/branches/sca-equinox/tools/eclipse34/features/process/feature.xml
+++ b/branches/sca-equinox/tools/eclipse/features/process/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/process/pom.xml b/branches/sca-equinox/tools/eclipse/features/process/pom.xml
index 9ad398109a..9ad398109a 100644
--- a/branches/sca-equinox/tools/eclipse34/features/process/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/features/process/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/web20/LICENSE b/branches/sca-equinox/tools/eclipse/features/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/features/web20/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/features/web20/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/features/web20/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/features/web20/META-INF/MANIFEST.MF
index 2dc129ebaa..2dc129ebaa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/features/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/features/web20/NOTICE b/branches/sca-equinox/tools/eclipse/features/web20/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/web20/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/features/web20/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/features/web20/build.properties b/branches/sca-equinox/tools/eclipse/features/web20/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/web20/build.properties
+++ b/branches/sca-equinox/tools/eclipse/features/web20/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/features/web20/feature.xml b/branches/sca-equinox/tools/eclipse/features/web20/feature.xml
index 8fe97d24a3..8fe97d24a3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/web20/feature.xml
+++ b/branches/sca-equinox/tools/eclipse/features/web20/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/web20/pom.xml b/branches/sca-equinox/tools/eclipse/features/web20/pom.xml
index 9d4b4d50b5..9d4b4d50b5 100644
--- a/branches/sca-equinox/tools/eclipse34/features/web20/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/features/web20/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/webservice/LICENSE b/branches/sca-equinox/tools/eclipse/features/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/features/webservice/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/features/webservice/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
index 9fb9f1282b..9fb9f1282b 100644
--- a/branches/sca-equinox/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/features/webservice/NOTICE b/branches/sca-equinox/tools/eclipse/features/webservice/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/features/webservice/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/features/webservice/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/features/webservice/build.properties b/branches/sca-equinox/tools/eclipse/features/webservice/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse34/features/webservice/build.properties
+++ b/branches/sca-equinox/tools/eclipse/features/webservice/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/features/webservice/feature.xml b/branches/sca-equinox/tools/eclipse/features/webservice/feature.xml
index d905b6475c..d905b6475c 100644
--- a/branches/sca-equinox/tools/eclipse34/features/webservice/feature.xml
+++ b/branches/sca-equinox/tools/eclipse/features/webservice/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse34/features/webservice/pom.xml b/branches/sca-equinox/tools/eclipse/features/webservice/pom.xml
index f42fa8ce48..f42fa8ce48 100644
--- a/branches/sca-equinox/tools/eclipse34/features/webservice/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/features/webservice/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
index 0d8b1053bf..0d8b1053bf 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/build.properties b/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/build.properties
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
index 6b6d79d45b..6b6d79d45b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/icons/t.gif b/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/icons/t.gif
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/icons/tuscany.gif b/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/icons/tuscany.gif
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
index ee9a3d2de9..ee9a3d2de9 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
index 7ea8d700f7..7ea8d700f7 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
index 70e794d2ce..70e794d2ce 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
index 7891cc31a6..7891cc31a6 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
index 883c7c0781..883c7c0781 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
index f90483a00d..f90483a00d 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
index 4830268272..4830268272 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
index 18850d9333..18850d9333 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
index 909290859a..909290859a 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
index 060f6ff6cb..060f6ff6cb 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
index edbe4b3e69..edbe4b3e69 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
index 056deb5b27..056deb5b27 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 5f8ea73db4..5f8ea73db4 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
index f66fa71191..f66fa71191 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
index 6eba5ffdc2..6eba5ffdc2 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
index 2a4c7206db..2a4c7206db 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
index 5fc1a75960..5fc1a75960 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
index 702da9701e..702da9701e 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
index a1c6cb86a7..a1c6cb86a7 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
index 5e059308e6..5e059308e6 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
index 5d9f2bdf70..5d9f2bdf70 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
index edc17c5ee2..edc17c5ee2 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/plugin.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
index b32ec079d4..b32ec079d4 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/src/main/assembly/jar.xml b/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
index 7832ba5131..7832ba5131 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-all.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-all.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-core.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-core.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-policy.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/sca.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 26be6feae5..26be6feae5 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
+++ b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
index fb238f04b1..fb238f04b1 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/build.properties b/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/build.properties
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
index 4051436888..4051436888 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
index 9b7c199c79..9b7c199c79 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
index fef1afe0b9..fef1afe0b9 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/plugin.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/ejava/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
index 752d20f7c1..752d20f7c1 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/ejava/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
index 2a70682fae..2a70682fae 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/build.properties b/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/build.properties
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
index 4ec1688b56..4ec1688b56 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
index 9c7df0f488..9c7df0f488 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
index 2e09146dfd..2e09146dfd 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/plugin.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/manager/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
index ae6b3516a2..ae6b3516a2 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/manager/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
index 0acd32e51c..0acd32e51c 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/build.properties b/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/build.properties
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
index a342de7bde..a342de7bde 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
index dab0eeaadc..dab0eeaadc 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
index 3e5f87f634..3e5f87f634 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/plugin.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/process/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
index 5e7366c07b..5e7366c07b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/process/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
index 3c2816ec4b..3c2816ec4b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/build.properties b/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/build.properties
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
index 3ccaa053bf..3ccaa053bf 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
index 96026db08e..96026db08e 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
index 6bf9087474..6bf9087474 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/plugin.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/web20/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
index 7c450e753e..7c450e753e 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/web20/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
index 9d83fd9b6b..9d83fd9b6b 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/build.properties b/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/build.properties
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
index 36ff7bb8df..36ff7bb8df 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
index 6310209c3a..6310209c3a 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
index 1fd46d3e75..1fd46d3e75 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/plugin.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse34/plugins/webservice/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
index 64fb36a15d..64fb36a15d 100644
--- a/branches/sca-equinox/tools/eclipse34/plugins/webservice/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/pom.xml b/branches/sca-equinox/tools/eclipse/pom.xml
index 3666fd6325..3666fd6325 100644
--- a/branches/sca-equinox/tools/eclipse34/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/site/updatesite/LICENSE b/branches/sca-equinox/tools/eclipse/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse34/site/updatesite/LICENSE
+++ b/branches/sca-equinox/tools/eclipse/site/updatesite/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse34/site/updatesite/NOTICE b/branches/sca-equinox/tools/eclipse/site/updatesite/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse34/site/updatesite/NOTICE
+++ b/branches/sca-equinox/tools/eclipse/site/updatesite/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse34/site/updatesite/etc/generate-p2.sh b/branches/sca-equinox/tools/eclipse/site/updatesite/etc/generate-p2.sh
index ea2eb865f4..ea2eb865f4 100755
--- a/branches/sca-equinox/tools/eclipse34/site/updatesite/etc/generate-p2.sh
+++ b/branches/sca-equinox/tools/eclipse/site/updatesite/etc/generate-p2.sh
diff --git a/branches/sca-equinox/tools/eclipse34/site/updatesite/pom.xml b/branches/sca-equinox/tools/eclipse/site/updatesite/pom.xml
index 0ef2f84873..0ef2f84873 100644
--- a/branches/sca-equinox/tools/eclipse34/site/updatesite/pom.xml
+++ b/branches/sca-equinox/tools/eclipse/site/updatesite/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse34/site/updatesite/site.xml b/branches/sca-equinox/tools/eclipse/site/updatesite/site.xml
index 1ea30f7f70..1ea30f7f70 100644
--- a/branches/sca-equinox/tools/eclipse34/site/updatesite/site.xml
+++ b/branches/sca-equinox/tools/eclipse/site/updatesite/site.xml
diff --git a/branches/sca-equinox/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml b/branches/sca-equinox/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index c1225e320b..c1225e320b 100644
--- a/branches/sca-equinox/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
+++ b/branches/sca-equinox/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-equinox/tools/pom.xml b/branches/sca-equinox/tools/pom.xml
index 66f10ca65b..6b1d404ed6 100644
--- a/branches/sca-equinox/tools/pom.xml
+++ b/branches/sca-equinox/tools/pom.xml
@@ -36,10 +36,9 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>eclipse34</module>

-                <module>java2wsdl</module>

+                <module>eclipse</module>

                 <module>maven</module>

-                <module>wsdl2java</module>

+                <module>sdo</module>

             </modules>

         </profile>

     </profiles>

diff --git a/branches/sca-equinox/tools/java2wsdl/LICENSE b/branches/sca-equinox/tools/sdo/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/java2wsdl/LICENSE
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/LICENSE
diff --git a/branches/sca-equinox/tools/java2wsdl/NOTICE b/branches/sca-equinox/tools/sdo/java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/java2wsdl/NOTICE
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/NOTICE
diff --git a/branches/sca-equinox/tools/java2wsdl/pom.xml b/branches/sca-equinox/tools/sdo/java2wsdl/pom.xml
index e9c97b283c..15c83fb039 100644
--- a/branches/sca-equinox/tools/java2wsdl/pom.xml
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/pom.xml
@@ -21,12 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-tools</artifactId>
+        <artifactId>tuscany-sca-sdo-tools</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-java2wsdl</artifactId>
     <name>Apache Tuscany SCA Java2WSDL Tool</name>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
@@ -39,26 +40,31 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
+
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>1.6.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
@@ -86,6 +92,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
@@ -97,11 +104,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen</artifactId>
             <version>2.2.3</version>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen-ecore</artifactId>
@@ -115,6 +124,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -136,6 +146,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.tuscany.sdo</groupId>
                 <artifactId>tuscany-sdo-plugin</artifactId>
@@ -160,6 +171,7 @@
             </plugin>
         </plugins>
     </build>
+
     <repositories>
         <repository>
             <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
@@ -171,4 +183,4 @@
             </snapshots>
         </repository>
     </repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index 60afe70534..60afe70534 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index a890dd624d..a890dd624d 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 9c8ff9df9e..9c8ff9df9e 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index bce30a48d3..bce30a48d3 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 897700ffd9..897700ffd9 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index fd10c77f8b..fd10c77f8b 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index 18cfafa4e3..18cfafa4e3 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index 3750dc27f5..3750dc27f5 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index d6cd8a7f57..d6cd8a7f57 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index 03291428a2..03291428a2 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index cb41c56b94..cb41c56b94 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index 66c9100ef9..66c9100ef9 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index e30ada3af5..e30ada3af5 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index 135b374357..135b374357 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index dfebd77215..dfebd77215 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
index 5406025643..5406025643 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index c587252d23..c587252d23 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index bf49d98888..bf49d98888 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index cf83095852..cf83095852 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index 901da8e551..901da8e551 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index 78a64dcc64..78a64dcc64 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/resources/AccountService.wsdl b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/resources/helloworld.wsdl b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/resources/interopdoc.wsdl b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-equinox/tools/java2wsdl/src/test/resources/sequences.xsd b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-equinox/tools/java2wsdl/src/test/resources/sequences.xsd
+++ b/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-equinox/tools/sdo/pom.xml b/branches/sca-equinox/tools/sdo/pom.xml
new file mode 100644
index 0000000000..dae6a7986a
--- /dev/null
+++ b/branches/sca-equinox/tools/sdo/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca-tools</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>pom</packaging>
+    <artifactId>tuscany-sca-sdo-tools</artifactId>
+    <name>Apache Tuscany SCA SDO Tools</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>java2wsdl</module>
+                <module>wsdl2java</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+</project>
diff --git a/branches/sca-equinox/tools/wsdl2java/LICENSE b/branches/sca-equinox/tools/sdo/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/wsdl2java/LICENSE
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/LICENSE
diff --git a/branches/sca-equinox/tools/wsdl2java/NOTICE b/branches/sca-equinox/tools/sdo/wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/wsdl2java/NOTICE
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/NOTICE
diff --git a/branches/sca-equinox/tools/wsdl2java/pom.xml b/branches/sca-equinox/tools/sdo/wsdl2java/pom.xml
index 6f13c6ca5e..0552e38ef5 100644
--- a/branches/sca-equinox/tools/wsdl2java/pom.xml
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/pom.xml
@@ -21,12 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-tools</artifactId>
+        <artifactId>tuscany-sca-sdo-tools</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-wsdl2java</artifactId>
     <name>Apache Tuscany SCA WSDL2Java Tool</name>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -34,6 +35,7 @@
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
@@ -49,21 +51,25 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-tools</artifactId>
             <version>1.1.1</version>
         </dependency>
+
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
             <version>2.1.7</version>
         </dependency>
+
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.1</version>
         </dependency>
+
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -76,16 +82,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
+
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>1.6.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
@@ -113,6 +122,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
@@ -124,11 +134,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen</artifactId>
             <version>2.2.3</version>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen-ecore</artifactId>
@@ -142,6 +154,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -163,6 +176,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.tuscany.sdo</groupId>
                 <artifactId>tuscany-sdo-plugin</artifactId>
@@ -187,6 +201,7 @@
             </plugin>
         </plugins>
     </build>
+
     <repositories>
         <repository>
             <snapshots>
@@ -207,4 +222,4 @@
             </snapshots>
         </repository>
     </repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index 08c7131208..08c7131208 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 8e0c3683a3..8e0c3683a3 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index 0c4f42633a..0c4f42633a 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 4ab152fb90..4ab152fb90 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index f6d1f3a64a..f6d1f3a64a 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index 43005bcdbc..43005bcdbc 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index 92581d6ac2..92581d6ac2 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/resources/AccountService.wsdl b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
index dda5a36085..dda5a36085 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/resources/helloworld.wsdl b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/resources/interopdoc.wsdl b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-equinox/tools/wsdl2java/src/test/resources/sequences.xsd b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-equinox/tools/wsdl2java/src/test/resources/sequences.xsd
+++ b/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/sequences.xsd