54 files changed, 86 insertions, 4 deletions

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