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

20 files changed, 17 insertions, 2 deletions

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