Merging the 1.x delta on top of the equinox based modules

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

3 files changed, 4 insertions, 11 deletions

diff --git a/java/sca/modules/databinding-sdo/pom.xml b/java/sca/modules/databinding-sdo/pom.xml
index a0ae3f45a2..17c4a648c7 100644
--- a/java/sca/modules/databinding-sdo/pom.xml
+++ b/java/sca/modules/databinding-sdo/pom.xml
@@ -85,7 +85,7 @@
                 <executions>
                     <execution>
                         <id>generate-po-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
                             <javaPackage>com.example.ipo.sdo</javaPackage>
@@ -99,7 +99,7 @@
                     </execution>
                     <execution>
                         <id>generate-stock-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
                             <javaPackage>com.example.stock.sdo</javaPackage>
diff --git a/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 5a5e35cbbd..0b58be9e41 100644
--- a/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
@@ -24,7 +24,6 @@ import java.security.PrivilegedAction;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
 import org.apache.tuscany.sca.databinding.WrapperHandler;
 import org.apache.tuscany.sca.databinding.XMLTypeHelper;
 import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
@@ -46,7 +45,6 @@ import commonj.sdo.helper.XMLDocument;
  */
 public class SDODataBinding extends BaseDataBinding {
     public static final String NAME = DataObject.class.getName();
-    public static final String[] ALIASES = new String[] {"sdo"};
 
     public static final String ROOT_NAMESPACE = "commonj.sdo";
     public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "dataObject");
@@ -55,7 +53,7 @@ public class SDODataBinding extends BaseDataBinding {
     private XMLTypeHelper xmlTypeHelper;
 
     public SDODataBinding() {
-        super(NAME, ALIASES, DataObject.class);
+        super(NAME, DataObject.class);
         wrapperHandler = new SDOWrapperHandler();
         xmlTypeHelper = new SDOTypeHelper();
     }
@@ -123,11 +121,6 @@ public class SDODataBinding extends BaseDataBinding {
     }
 
     @Override
-    public SimpleTypeMapper getSimpleTypeMapper() {
-        return new SDOSimpleTypeMapper();
-    }
-
-    @Override
     public XMLTypeHelper getXMLTypeHelper() {
         // return new SDOTypeHelper();
         return xmlTypeHelper;
diff --git a/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afd00b552c..5ae557cc74 100644
--- a/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
@@ -16,4 +16,4 @@
 # under the License.
 
 # implementation classes for the databindings
-org.apache.tuscany.sca.databinding.sdo.SDODataBinding;type=commonj.sdo.DataObject,name=sdo
\ No newline at end of file
+org.apache.tuscany.sca.databinding.sdo.SDODataBinding;name=commonj.sdo.DataObject