You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/09/30 06:02:39 UTC
svn commit: r700330 - in /tuscany/java/sca/modules:
core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/
databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/
databinding-axiom/src/main/resources/META...
Author: rfeng
Date: Mon Sep 29 21:02:38 2008
New Revision: 700330
URL: http://svn.apache.org/viewvc?rev=700330&view=rev
Log:
Start cleaning up the databinding framework to remove obsolete code
Modified:
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
tuscany/java/sca/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
tuscany/java/sca/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
Modified: tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java (original)
+++ tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java Mon Sep 29 21:02:38 2008
@@ -26,12 +26,11 @@
public class CallableReferenceDataBinding extends BaseDataBinding {
public static final String NAME = CallableReference.class.getName();
- public static final String[] ALIASES = new String[] {"callablereference"};
private CallableReferenceTypeHelper xmlTypeHelper;
public CallableReferenceDataBinding() {
- super(NAME, ALIASES, CallableReference.class);
+ super(NAME, CallableReference.class);
this.xmlTypeHelper = new CallableReferenceTypeHelper();
}
Modified: tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java Mon Sep 29 21:02:38 2008
@@ -33,10 +33,9 @@
public class AxiomDataBinding extends BaseDataBinding {
public static final String NAME = OMElement.class.getName();
- public static final String[] ALIASES = new String[] {"axiom"};
public AxiomDataBinding() {
- super(NAME, ALIASES, OMElement.class);
+ super(NAME, OMElement.class);
}
/**
Modified: tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,5 +16,5 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.axiom.AxiomDataBinding;type=org.apache.axiom.om.OMElement,name=axiom
+org.apache.tuscany.sca.databinding.axiom.AxiomDataBinding;name=org.apache.axiom.om.OMElement
Modified: tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java Mon Sep 29 21:02:38 2008
@@ -43,7 +43,6 @@
*/
public class JAXBDataBinding extends BaseDataBinding {
public static final String NAME = JAXBElement.class.getName();
- public static final String[] ALIASES = new String[] {"jaxb"};
public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/jaxb/1.0";
public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
@@ -52,7 +51,7 @@
private JAXBTypeHelper xmlTypeHelper;
public JAXBDataBinding() {
- super(NAME, ALIASES, JAXBElement.class);
+ super(NAME, JAXBElement.class);
this.wrapperHandler = new JAXBWrapperHandler();
this.xmlTypeHelper = new JAXBTypeHelper();
}
Modified: tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,4 +16,4 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;type=javax.xml.bind.JAXBElement,name=jaxb
+org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;name=javax.xml.bind.JAXBElement
Modified: tuscany/java/sca/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java Mon Sep 29 21:02:38 2008
@@ -27,10 +27,9 @@
public class JobDataBinding extends BaseDataBinding {
public static final String NAME = Job.class.getName();
- public static final String[] ALIASES = new String[] {"job"};
public JobDataBinding() {
- super(NAME, ALIASES, Job.class);
+ super(NAME, Job.class);
}
}
Modified: tuscany/java/sca/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,5 +16,5 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.job.JobDataBinding;type=org.apache.tuscany.sca.databinding.job.Job,name=job
+org.apache.tuscany.sca.databinding.job.JobDataBinding;name=org.apache.tuscany.sca.databinding.job.Job
Modified: tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java Mon Sep 29 21:02:38 2008
@@ -35,13 +35,12 @@
*/
public class JSONDataBinding extends BaseDataBinding {
public static final String NAME = "JSON";
- public static final String[] ALIASES = new String[] {"json"};
public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/json/1.0";
public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
public JSONDataBinding() {
- super(NAME, ALIASES, org.json.JSONObject.class);
+ super(NAME, org.json.JSONObject.class);
}
@Override
Modified: tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,4 +16,4 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.json.JSONDataBinding;type=JSON,name=json
\ No newline at end of file
+org.apache.tuscany.sca.databinding.json.JSONDataBinding;name=JSON
Modified: tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,5 +16,5 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;type=net.sf.saxon.om.NodeInfo,name=saxon_node
-org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;type=net.sf.saxon.value.Value,name=saxon_value
\ No newline at end of file
+org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;name=net.sf.saxon.om.NodeInfo
+org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;name=net.sf.saxon.value.Value
Modified: tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java Mon Sep 29 21:02:38 2008
@@ -24,7 +24,6 @@
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 @@
*/
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 @@
private XMLTypeHelper xmlTypeHelper;
public SDODataBinding() {
- super(NAME, ALIASES, DataObject.class);
+ super(NAME, DataObject.class);
wrapperHandler = new SDOWrapperHandler();
xmlTypeHelper = new SDOTypeHelper();
}
@@ -123,11 +121,6 @@
}
@Override
- public SimpleTypeMapper getSimpleTypeMapper() {
- return new SDOSimpleTypeMapper();
- }
-
- @Override
public XMLTypeHelper getXMLTypeHelper() {
// return new SDOTypeHelper();
return xmlTypeHelper;
Modified: tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -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
Modified: tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,4 +16,4 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.xmlbeans.XMLBeansDataBinding;type=org.apache.xmlbeans.XmlObject,name=xmlbeans
\ No newline at end of file
+org.apache.tuscany.sca.databinding.xmlbeans.XMLBeansDataBinding;name=org.apache.xmlbeans.XmlObject
Modified: tuscany/java/sca/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java Mon Sep 29 21:02:38 2008
@@ -29,10 +29,9 @@
public class XObjectDataBinding extends BaseDataBinding {
public static final String NAME = XObject.class.getName();
- public static final String[] ALIASES = new String[] {"xobject"};
public XObjectDataBinding() {
- super(NAME, ALIASES, XObject.class);
+ super(NAME, XObject.class);
}
}
Modified: tuscany/java/sca/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,5 +16,5 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.xstream.XObjectDataBinding;type=org.apache.tuscany.sca.databinding.xstream.XObject,name=xobject
+org.apache.tuscany.sca.databinding.xstream.XObjectDataBinding;name=org.apache.tuscany.sca.databinding.xstream.XObject
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java Mon Sep 29 21:02:38 2008
@@ -47,13 +47,6 @@
* @return The name of the databinding
*/
String getName();
-
- /**
- * Get the aliases for the databinding
- *
- * @return An array of aliases
- */
- String[] getAliases();
/**
* Introspect and populate information to a DataType model
@@ -90,12 +83,6 @@
Object copy(Object object, DataType dataType, Operation operation);
/**
- * Get the type mapper for simple types
- * @return The databinding-specific simple type mapper
- */
- SimpleTypeMapper getSimpleTypeMapper();
-
- /**
* Get the XML type helper for Java types
* @return The databinding-specific XML type helper class
*/
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java Mon Sep 29 21:02:38 2008
@@ -71,17 +71,11 @@
className = ((LazyDataBinding)dataBinding).dataBindingDeclaration.getClassName();
lazy = true;
}
- logger.fine("Adding databinding: " + className + ";type=" + dataBinding.getName() + ",lazy=" + lazy);
+ logger.fine("Adding databinding: " + className + ";name=" + dataBinding.getName() + ",lazy=" + lazy);
}
databindings.add(dataBinding);
bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
- String[] aliases = dataBinding.getAliases();
- if (aliases != null) {
- for (String alias : aliases) {
- bindings.put(alias.toLowerCase(), dataBinding);
- }
- }
}
public DataBinding removeDataBinding(String id) {
@@ -91,12 +85,6 @@
DataBinding dataBinding = bindings.remove(id.toLowerCase());
if (dataBinding != null) {
databindings.remove(dataBinding);
- String[] aliases = dataBinding.getAliases();
- if (aliases != null) {
- for (String alias : aliases) {
- bindings.remove(alias.toLowerCase());
- }
- }
}
return dataBinding;
}
@@ -119,11 +107,10 @@
// Load data bindings
for (ServiceDeclaration dataBindingDeclaration : dataBindingDeclarations) {
Map<String, String> attributes = dataBindingDeclaration.getAttributes();
- String type = attributes.get("type");
String name = attributes.get("name");
// Create a data binding wrapper and register it
- DataBinding dataBinding = new LazyDataBinding(type, name, dataBindingDeclaration);
+ DataBinding dataBinding = new LazyDataBinding(name, dataBindingDeclaration);
addDataBinding(dataBinding);
}
@@ -137,15 +124,11 @@
private static class LazyDataBinding implements DataBinding {
private String name;
- private String[] aliases;
private ServiceDeclaration dataBindingDeclaration;
private DataBinding dataBinding;
- private LazyDataBinding(String type, String name, ServiceDeclaration dataBindingDeclaration) {
+ private LazyDataBinding(String type, ServiceDeclaration dataBindingDeclaration) {
this.name = type;
- if (name != null) {
- this.aliases = new String[] {name};
- }
this.dataBindingDeclaration = dataBindingDeclaration;
}
@@ -172,18 +155,10 @@
return getDataBinding().copy(object, dataType, operation);
}
- public String[] getAliases() {
- return aliases;
- }
-
public String getName() {
return name;
}
- public SimpleTypeMapper getSimpleTypeMapper() {
- return getDataBinding().getSimpleTypeMapper();
- }
-
public XMLTypeHelper getXMLTypeHelper() {
return getDataBinding().getXMLTypeHelper();
}
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java Mon Sep 29 21:02:38 2008
@@ -29,10 +29,9 @@
public class ExternalizableDataBinding extends BaseDataBinding {
public static final String NAME = java.io.Externalizable.class.getName();
- public static final String[] ALIASES = new String[] {"externalizable"};
public ExternalizableDataBinding() {
- super(NAME, ALIASES, java.io.Externalizable.class);
+ super(NAME, java.io.Externalizable.class);
}
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java Mon Sep 29 21:02:38 2008
@@ -38,7 +38,6 @@
private Class<?> baseType;
private String name;
- private String[] aliases;
/**
* Create a databinding with the base java type whose name will be used as
@@ -48,7 +47,7 @@
* databinding, for example, org.w3c.dom.Node
*/
protected BaseDataBinding(Class<?> baseType) {
- this(baseType.getName(), null, baseType);
+ this(baseType.getName(), baseType);
}
/**
@@ -59,21 +58,8 @@
* databinding, for example, org.w3c.dom.Node
*/
protected BaseDataBinding(String name, Class<?> baseType) {
- this(name, null, baseType);
- }
-
- /**
- * Create a databinding with the name and base java type
- *
- * @param name The name of the databinding
- * @param aliases The aliases of the databinding
- * @param baseType The base java class or interface representing the
- * databinding, for example, org.w3c.dom.Node
- */
- protected BaseDataBinding(String name, String[] aliases, Class<?> baseType) {
this.name = name;
this.baseType = baseType;
- this.aliases = aliases;
}
@SuppressWarnings("unchecked")
@@ -118,16 +104,8 @@
return object;
}
- public SimpleTypeMapper getSimpleTypeMapper() {
- return new SimpleTypeMapperImpl();
- }
-
public XMLTypeHelper getXMLTypeHelper() {
return null;
}
- public String[] getAliases() {
- return aliases;
- }
-
}
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java Mon Sep 29 21:02:38 2008
@@ -40,7 +40,7 @@
protected Class[] markerTypes;
public GroupDataBinding(Class[] types) {
- super(NAME, null, GroupDataBinding.class);
+ super(NAME, GroupDataBinding.class);
this.markerTypes = types;
}
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java Mon Sep 29 21:02:38 2008
@@ -58,7 +58,7 @@
}
// HACK: [rfeng] By pass the one know to XMLString
String db = type.getDataBinding();
- if (db != null && (XMLStringDataBinding.NAME.equals(db) || XMLStringDataBinding.ALIASES[0].equals(db))) {
+ if (db != null && (XMLStringDataBinding.NAME.equals(db))) {
return false;
}
if (SimpleTypeMapperImpl.JAVA2XML.keySet().contains(cls)) {
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java Mon Sep 29 21:02:38 2008
@@ -35,13 +35,12 @@
*/
public class DOMDataBinding extends BaseDataBinding {
public static final String NAME = Node.class.getName();
- public static final String[] ALIASES = new String[] {"dom"};
public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/dom/1.0";
public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
public DOMDataBinding() {
- super(NAME, ALIASES, Node.class);
+ super(NAME, Node.class);
}
@Override
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java Mon Sep 29 21:02:38 2008
@@ -34,10 +34,9 @@
*/
public class StAXDataBinding extends BaseDataBinding {
public static final String NAME = XMLStreamReader.class.getName();
- public static final String[] ALIASES = new String[] {"stax"};
public StAXDataBinding() {
- super(NAME, ALIASES, XMLStreamReader.class);
+ super(NAME, XMLStreamReader.class);
}
@Override
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java Mon Sep 29 21:02:38 2008
@@ -50,7 +50,7 @@
private XMLStreamReader realReader;
private boolean fragment;
- private int level = 0;
+ private int level = 1;
private int state = STATE_INIT;
Modified: tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java (original)
+++ tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java Mon Sep 29 21:02:38 2008
@@ -32,15 +32,14 @@
*/
public class XMLStringDataBinding extends BaseDataBinding {
public static final String NAME = String.class.getName();
- public static final String[] ALIASES = new String[] {"xml.string"};
public XMLStringDataBinding() {
- super(NAME, ALIASES, String.class);
+ super(NAME, String.class);
}
@Override
public boolean introspect(DataType type, Operation operation) {
- if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding())) {
+ if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding())) {
type.setDataBinding(NAME);
type.setLogical(XMLType.UNKNOWN);
return true;
Modified: tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding (original)
+++ tuscany/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding Mon Sep 29 21:02:38 2008
@@ -16,10 +16,10 @@
# under the License.
# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.xml.DOMDataBinding;type=org.w3c.dom.Node,name=dom
-org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;type=java.lang.String,name=xml.string
-org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;type=databinding:group
-org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;type=java:complexType
-org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;type=java:simpleType
-org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;type=java:exception
-org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;type=java.io.Externalizable,name=externalizable
+org.apache.tuscany.sca.databinding.xml.DOMDataBinding;name=org.w3c.dom.Node
+org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;name=java.lang.String
+org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;name=databinding:group
+org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;name=java:complexType
+org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;name=java:simpleType
+org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;name=java:exception
+org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;name=java.io.Externalizable
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java?rev=700330&r1=700329&r2=700330&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java Mon Sep 29 21:02:38 2008
@@ -54,7 +54,6 @@
@SuppressWarnings("unchecked")
public void testRegistry() {
DataBinding db1 = createMock(DataBinding.class);
- expect(db1.getAliases()).andReturn(new String[] {"db1"}).anyTimes();
expect(db1.getName()).andReturn(ContentHandler.class.getName()).anyTimes();
DataType<Class> dataType1 = new DataTypeImpl<Class>(ContentHandler.class, ContentHandler.class);
expect(db1.introspect(dataType1, null)).andReturn(true);
@@ -65,7 +64,6 @@
registry.addDataBinding(db1);
DataBinding db2 = createMock(DataBinding.class);
- expect(db2.getAliases()).andReturn(new String[] {"db2"}).anyTimes();
expect(db2.getName()).andReturn(XMLStreamReader.class.getName()).anyTimes();
DataType<Class> dataType2 = new DataTypeImpl<Class>(XMLStreamReader.class, XMLStreamReader.class);
expect(db2.introspect(dataType2, null)).andReturn(true);
@@ -80,10 +78,6 @@
DataBinding db3 = registry.getDataBinding(name);
assertSame(db1, db3);
- // Look up by alias
- DataBinding db5 = registry.getDataBinding("db1");
- assertSame(db1, db5);
-
DataType dt = new DataTypeImpl<Class>(ContentHandler.class, null);
registry.introspectType(dt, null);
assertEquals(dataType1.getLogical(), ContentHandler.class);