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 2007/03/18 01:49:12 UTC
svn commit: r519492 [1/2] - in
/incubator/tuscany/java/sca/services/databinding: databinding-sdo-axiom/
databinding-sdo-axiom/src/ databinding-sdo-axiom/src/main/
databinding-sdo-axiom/src/main/java/
databinding-sdo-axiom/src/main/java/org/ databinding...
Author: rfeng
Date: Sat Mar 17 17:49:08 2007
New Revision: 519492
URL: http://svn.apache.org/viewvc?view=rev&rev=519492
Log:
Merge databinding-sdo from sca-java-integration branch
Added:
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/ (props changed)
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/.checkstyle
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/.checkstyle
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/.ruleset
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/.ruleset
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/LICENSE.txt
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/LICENSE.txt
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/NOTICE.txt
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/NOTICE.txt
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/pom.xml
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObjectSerializer.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObjectSerializer.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/SDODataSource.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/SDODataSource.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/resources/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/resources/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/sca/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/sca/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/sca/databinding.sdo-axiom.scdl
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/sca/databinding.sdo-axiom.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/sca/extension.composite
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/resources/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/resources/
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/resources/ipo.xsd
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/resources/ipo.xsd
incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/resources/stock.xsd
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/resources/stock.xsd
incubator/tuscany/java/sca/services/databinding/databinding-sdo/.checkstyle
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java (with props)
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java (with props)
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/com/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/com/example/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/
- copied from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandlerTestCase.java
- copied, changed from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandlerTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/resources/stock.xsd
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/stock.xsd
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xml
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xml
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xsd
- copied unchanged from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xsd
Removed:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 17 17:49:08 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/pom.xml (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/pom.xml?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/pom.xml&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/pom.xml&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/pom.xml Sat Mar 17 17:49:08 2007
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>parent</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-sdo-axiom</artifactId>
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-spi</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java Sat Mar 17 17:49:08 2007
@@ -29,8 +29,8 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.XMLType;
import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java Sat Mar 17 17:49:08 2007
@@ -7,8 +7,8 @@
import junit.framework.Assert;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.DataObject;
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java Sat Mar 17 17:49:08 2007
@@ -2,17 +2,14 @@
import java.io.StringWriter;
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import junit.framework.Assert;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.XMLType;
-import commonj.sdo.DataObject;
import commonj.sdo.helper.XMLDocument;
/**
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/.checkstyle?view=auto&rev=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/.checkstyle (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/.checkstyle Sat Mar 17 17:49:08 2007
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="Tuscany Checks" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml Sat Mar 17 17:49:08 2007
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-sdo</artifactId>
@@ -31,28 +31,27 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-spi</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>${pom.version}</version>
+ <version>1.0-incubator-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.2</version>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -82,7 +81,7 @@
<version>1.0-incubator-SNAPSHOT</version>
<executions>
<execution>
- <id>generate-sdo</id>
+ <id>generate-po-sdo</id>
<phase>generate-test-sources</phase>
<configuration>
<schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
@@ -95,9 +94,23 @@
<goal>generate</goal>
</goals>
</execution>
+ <execution>
+ <id>generate-stock-sdo</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
+ <javaPackage>com.example.stock.sdo</javaPackage>
+ <prefix>Stock</prefix>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
</build>
-
</project>
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java Sat Mar 17 17:49:08 2007
@@ -33,21 +33,14 @@
@Service(Transformer.class)
public class DataObject2String extends TransformerExtension<DataObject, String> implements
- PullTransformer<DataObject, String> {
-
- private static final String TUSCANY_SDO = "http://tuscany.apache.org/xmlns/sdo/1.0-SNAPSHOT";
+ PullTransformer<DataObject, String> {
public String transform(DataObject source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
- Object logicalType = context.getSourceDataType().getLogical();
- if (logicalType instanceof QName) {
- QName elementName = (QName) logicalType;
- return xmlHelper.save(source, elementName.getNamespaceURI(), elementName.getLocalPart());
- } else {
- return xmlHelper.save(source, TUSCANY_SDO, "dataObject");
- }
+ QName elementName = SDOContextHelper.getElement(context.getSourceDataType());
+ return xmlHelper.save(source, elementName.getNamespaceURI(), elementName.getLocalPart());
} catch (Exception e) {
throw new TransformationException(e);
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java Sat Mar 17 17:49:08 2007
@@ -42,11 +42,9 @@
public XMLStreamReader transform(DataObject source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
- Object logicalType = context.getSourceDataType().getLogical();
- QName elementName =
- (logicalType instanceof QName) ? (QName) logicalType : new QName("commonj.sdo", "dataObject");
+ QName elementName = SDOContextHelper.getElement(context.getSourceDataType());
XMLHelper xmlHelper = helperContext.getXMLHelper();
XMLDocument document =
xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java Sat Mar 17 17:49:08 2007
@@ -24,49 +24,38 @@
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.StAXElementLoader;
import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Destroy;
/**
* A SDO model-based Loader to load DataObject from the XML stream
- *
*/
@EagerInit
-public class DataObjectLoader implements StAXElementLoader<ModelObject> {
- protected LoaderRegistry registry;
- private QName propertyQName;
+public class DataObjectLoader extends LoaderExtension<ModelDataObject> {
+ private QName elementName;
- public DataObjectLoader(Property property) {
- super();
- this.propertyQName = new QName(XSDHelper.INSTANCE.getNamespaceURI(property),
- XSDHelper.INSTANCE.getLocalName(property));
+ public DataObjectLoader(@Reference LoaderRegistry registry,
+ @Property(name = "namespace", required = true) String namespace,
+ @Property(name = "name", required = true) String name) {
+ super(registry);
+ this.elementName = new QName(namespace, name);
}
- public DataObjectLoader(QName propertyQName) {
- super();
- this.propertyQName = propertyQName;
- }
-
- public ModelObject load(CompositeComponent parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
- assert propertyQName.equals(reader.getName());
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(deploymentContext);
+ public ModelDataObject load(ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ assert elementName.equals(reader.getName());
+ HelperContext helperContext = SDOContextHelper.getHelperContext(object);
TypeHelper typeHelper = helperContext.getTypeHelper();
XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
DataObject dataObject = streamHelper.loadObject(reader);
@@ -74,20 +63,9 @@
return new ModelDataObject(dataObject);
}
- @Autowire
- public void setRegistry(LoaderRegistry registry) {
- this.registry = registry;
- }
-
- @Init
- public void start() {
- registry.registerLoader(propertyQName, this);
+ @Override
+ public QName getXMLType() {
+ return elementName;
}
-
- @Destroy
- public void stop() {
- registry.unregisterLoader(propertyQName, this);
- }
-
}
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java?view=auto&rev=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java Sat Mar 17 17:49:08 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.databinding.sdo;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+
+/**
+ * To be injected with SDO HelperContext
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface HelperContext {
+}
\ No newline at end of file
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java?view=auto&rev=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java Sat Mar 17 17:49:08 2007
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.databinding.sdo;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URI;
+
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
+import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
+import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
+import org.apache.tuscany.spi.implementation.java.JavaMappedService;
+import org.apache.tuscany.spi.implementation.java.PojoComponentType;
+import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.spi.implementation.java.Resource;
+import org.osoa.sca.annotations.Context;
+
+import commonj.sdo.helper.HelperContext;
+
+/**
+ * Processes {@link @HelperContext} annotations on a component implementation
+ * and adds a {@link JavaMappedProperty} to the component type which will be
+ * used to inject the appropriate context
+ *
+ * @version $Rev$ $Date$
+ */
+public class HelperContextProcessor extends ImplementationProcessorExtension {
+
+ /**
+ * Takes a setter or getter method name and converts it to a property name
+ * according to JavaBean conventions. For example, <code>setFoo(var)</code>
+ * is returned as property <code>foo<code>
+ */
+ public static String toPropertyName(String name) {
+ if (!name.startsWith("set")) {
+ return name;
+ }
+ return Character.toLowerCase(name.charAt(3)) + name.substring(4);
+ }
+
+ public void visitMethod(Method method,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException {
+ if (!method.isAnnotationPresent(Context.class)) {
+ return;
+ }
+ if (method.getParameterTypes().length != 1) {
+ throw new IllegalArgumentException("HelperContext setter must have one parameter: " + method);
+ }
+ Class<?> paramType = method.getParameterTypes()[0];
+ if (HelperContext.class == paramType) {
+ String name = toPropertyName(method.getName());
+ Resource<HelperContext> resource = new Resource<HelperContext>(name, HelperContext.class, method);
+ type.getResources().put(name, resource);
+ resource.setObjectFactory(new HelperContextFactory(context.getComponentId()));
+ }
+ }
+
+ public void visitField(Field field,
+ PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ DeploymentContext context) throws ProcessingException {
+ if (field.getAnnotation(Context.class) == null) {
+ return;
+ }
+ Class<?> paramType = field.getType();
+ if (HelperContext.class == paramType) {
+ String name = field.getName();
+ Resource<HelperContext> resource = new Resource<HelperContext>(name, HelperContext.class, field);
+ type.getResources().put(name, resource);
+ resource.setObjectFactory(new HelperContextFactory(context.getComponentId()));
+ }
+ }
+
+ private static class HelperContextFactory implements ObjectFactory<HelperContext> {
+ private URI parent;
+
+ public HelperContextFactory(URI parent) {
+ super();
+ this.parent = parent;
+ }
+
+ public HelperContext getInstance() throws ObjectCreationException {
+ return null;
+ }
+
+ }
+}
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java Sat Mar 17 17:49:08 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.databinding.sdo;
+import static org.apache.tuscany.databinding.sdo.ImportSDO.IMPORT_SDO;
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -29,8 +31,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -38,6 +38,7 @@
import org.apache.tuscany.spi.loader.LoaderUtil;
import org.apache.tuscany.spi.model.ModelObject;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XSDHelper;
@@ -49,11 +50,9 @@
* @version $Rev$ $Date$
*/
public class ImportSDOLoader extends LoaderExtension {
- public static final QName IMPORT_SDO =
- new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
@Constructor({"registry"})
- public ImportSDOLoader(@Autowire LoaderRegistry registry) {
+ public ImportSDOLoader(@Reference LoaderRegistry registry) {
super(registry);
}
@@ -61,20 +60,19 @@
return IMPORT_SDO;
}
- public ModelObject load(CompositeComponent parent,
- ModelObject object,
+ public ModelObject load(ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert IMPORT_SDO.equals(reader.getName());
// FIXME: [rfeng] How to associate the TypeHelper with deployment
// context?
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(deploymentContext);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(object);
importFactory(reader, deploymentContext, helperContext);
importWSDL(reader, deploymentContext, helperContext);
LoaderUtil.skipToEndElement(reader);
- return new SDOType(helperContext);
+ return new ImportSDO(helperContext);
}
private void importFactory(XMLStreamReader reader, DeploymentContext deploymentContext, HelperContext helperContext)
@@ -100,7 +98,6 @@
Field field = factoryClass.getField("INSTANCE");
Object factory = field.get(null);
Method method = factory.getClass().getMethod("register", new Class[] {HelperContext.class});
-
method.invoke(factory, new Object[] {helperContext});
// FIXME: How do we associate the application HelperContext with the one
@@ -135,24 +132,29 @@
} finally {
xsdInputStream.close();
}
+ // FIXME: How do we associate the application HelperContext with the one
+ // imported by the composite
+ HelperContext defaultContext = HelperProvider.getDefaultContext();
+ xsdInputStream = wsdlURL.openStream();
+ try {
+ XSDHelper xsdHelper = defaultContext.getXSDHelper();
+ ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
+ try {
+ // set TCCL as SDO needs it
+ ClassLoader cl = deploymentContext.getClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ xsdHelper.define(xsdInputStream, wsdlURL.toExternalForm());
+ } finally {
+ Thread.currentThread().setContextClassLoader(oldCL);
+ }
+ } finally {
+ xsdInputStream.close();
+ }
} catch (IOException e) {
LoaderException sfe = new LoaderException(e.getMessage());
sfe.setResourceURI(location);
throw sfe;
}
- }
- }
-
- public static class SDOType extends ModelObject {
- private HelperContext helperContext;
-
- public SDOType(HelperContext helperContext) {
- super();
- this.helperContext = helperContext;
- }
-
- public HelperContext getHelperContext() {
- return helperContext;
}
}
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java Sat Mar 17 17:49:08 2007
@@ -22,6 +22,11 @@
import commonj.sdo.DataObject;
+/**
+ * Wrapper of DataObject as a ModelObject
+ *
+ * @version $Rev$ $Date$
+ */
public class ModelDataObject extends ModelObject {
private DataObject dataObject;
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java Sat Mar 17 17:49:08 2007
@@ -23,13 +23,13 @@
import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.ModelObject;
+import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.impl.HelperProvider;
@@ -46,19 +46,19 @@
return getDefaultHelperContext();
}
HelperContext helperContext = null;
- CompositeComponent composite = (CompositeComponent)context.getMetadata().get(CompositeComponent.class);
+ Component composite = (Component)context.getMetadata().get(Component.class);
if (composite != null) {
// SDOHelperContext sdoContext =
// (SDOHelperContext)composite.getExtensions().get(HelperContext.class.getName());
// if (sdoContext != null) {
// helperContext = sdoContext.getHelperContext();
// }
- AtomicComponent child = (AtomicComponent)composite.getSystemChild(HelperContext.class.getName());
- try {
- helperContext = (HelperContext)child.getTargetInstance();
- } catch (TargetResolutionException e) {
- helperContext = null;
- }
+// AtomicComponent child = (AtomicComponent)composite.getSystemChild(HelperContext.class.getName());
+// try {
+// helperContext = (HelperContext)child.getTargetInstance();
+// } catch (TargetResolutionException e) {
+// helperContext = null;
+// }
}
if (helperContext == null) {
return getDefaultHelperContext();
@@ -76,7 +76,7 @@
helperContext = (HelperContext)model.getExtensions().get(ImportSDO.IMPORT_SDO);
if (helperContext == null) {
helperContext = SDOUtil.createHelperContext();
- ((CompositeComponentType<?, ?, ?>)model).getDeclaredExtensions().put(ImportSDO.IMPORT_SDO,
+ ((CompositeComponentType<?, ?, ?>)model).getExtensions().put(ImportSDO.IMPORT_SDO,
helperContext);
}
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java Sat Mar 17 17:49:08 2007
@@ -19,17 +19,23 @@
package org.apache.tuscany.databinding.sdo;
+import java.lang.annotation.Annotation;
+
import javax.xml.namespace.QName;
+import org.apache.tuscany.spi.databinding.ExceptionHandler;
import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
+import commonj.sdo.helper.CopyHelper;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.impl.HelperProvider;
/**
* SDO Databinding
@@ -37,41 +43,80 @@
* @version $Reve$ $Date$
*/
public class SDODataBinding extends DataBindingExtension {
- private WrapperHandler<Object> wrapperHandler;
+ 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");
+
+ private WrapperHandler<Object> wrapperHandler;
+
public SDODataBinding() {
- super(DataObject.class);
+ super(NAME, ALIASES, DataObject.class);
wrapperHandler = new SDOWrapperHandler();
}
@Override
- public DataType introspect(Class<?> javaType) {
- if (javaType == null) {
- return null;
+ public boolean introspect(DataType dataType, Annotation[] annotations) {
+ Object physical = dataType.getPhysical();
+ if (!(physical instanceof Class)) {
+ return false;
}
+ Class javaType = (Class)physical;
+ HelperContext context = HelperProvider.getDefaultContext();
+ // FIXME: Need a better to test dynamic SDO
if (DataObject.class.isAssignableFrom(javaType)) {
// Dynamic SDO
- return new DataType<QName>(getName(), javaType, null);
+ dataType.setDataBinding(getName());
+ dataType.setLogical(XMLType.UNKNOWN);
+ return true;
}
// FIXME: We need to access HelperContext
- Type type = TypeHelper.INSTANCE.getType(javaType);
- if (type == null || type.isDataType()) {
- return null;
+ Type type = context.getTypeHelper().getType(javaType);
+ if (type == null) {
+ return false;
+ }
+ if (type.isDataType()) {
+ // FIXME: Ignore simple types?
+ return false;
}
String namespace = type.getURI();
- String name = XSDHelper.INSTANCE.getLocalName(type);
+ String name = context.getXSDHelper().getLocalName(type);
QName xmlType = new QName(namespace, name);
- DataType<QName> dataType = new DataType<QName>(getName(), javaType, xmlType);
- return dataType;
+ dataType.setDataBinding(getName());
+ dataType.setLogical(new XMLType(null, xmlType));
+ return true;
}
@Override
public WrapperHandler getWrapperHandler() {
return wrapperHandler;
}
-
+
public SimpleTypeMapper getSimpleTypeMapper() {
return new SDOSimpleTypeMapper();
+ }
+
+ @Override
+ public Object copy(Object arg) {
+ HelperContext context = HelperProvider.getDefaultContext();
+ CopyHelper copyHelper = context.getCopyHelper();
+ if (arg instanceof XMLDocument) {
+ XMLDocument document = (XMLDocument)arg;
+ DataObject dataObject = copyHelper.copy(document.getRootObject());
+ return context.getXMLHelper().createDocument(dataObject,
+ document.getRootElementURI(),
+ document.getRootElementName());
+ } else if (arg instanceof DataObject) {
+ return context.getCopyHelper().copy((DataObject)arg);
+ } else {
+ return super.copy(arg);
+ }
+ }
+
+ @Override
+ public ExceptionHandler getExceptionHandler() {
+ return new SDOExceptionHandler();
}
}
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java Sat Mar 17 17:49:08 2007
@@ -26,8 +26,8 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
-import org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.Type;
import commonj.sdo.helper.HelperContext;
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java (from r518390, incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java?view=diff&rev=519492&p1=incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java&r1=518390&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java&r2=519492
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java Sat Mar 17 17:49:08 2007
@@ -20,7 +20,7 @@
package org.apache.tuscany.databinding.sdo;
import org.apache.tuscany.spi.component.AbstractSCAObject;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.Scope;
import commonj.sdo.helper.HelperContext;
@@ -32,8 +32,8 @@
* @param name
* @param parent
*/
- public SDOHelperContext(CompositeComponent parent, HelperContext helperContext) {
- super(HelperContext.class.getName(), parent);
+ public SDOHelperContext(Component parent, HelperContext helperContext) {
+ super(parent.getUri().resolve("/" + HelperContext.class.getName() + "/"));
this.helperContext = helperContext;
}
@@ -45,4 +45,4 @@
return helperContext;
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java Sat Mar 17 17:49:08 2007
@@ -24,7 +24,6 @@
import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.idl.TypeInfo;
import commonj.sdo.Type;
import commonj.sdo.helper.HelperContext;
@@ -40,26 +39,24 @@
super();
}
- public Object toJavaObject(TypeInfo simpleType, String value, TransformationContext context) {
- QName typeName = simpleType.getQName();
+ public Object toJavaObject(QName typeName, String value, TransformationContext context) {
Type type = null;
if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
} else {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
TypeHelper typeHelper = helperContext.getTypeHelper();
type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
}
return SDOUtil.createFromString(type, value);
}
- public String toXMLLiteral(TypeInfo simpleType, Object obj, TransformationContext context) {
- QName typeName = simpleType.getQName();
+ public String toXMLLiteral(QName typeName, Object obj, TransformationContext context) {
Type type = null;
if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
} else {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
TypeHelper typeHelper = helperContext.getTypeHelper();
type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java Sat Mar 17 17:49:08 2007
@@ -19,13 +19,20 @@
package org.apache.tuscany.databinding.sdo;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
import javax.xml.namespace.QName;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.WrapperHandler;
-import org.apache.tuscany.spi.idl.ElementInfo;
+import org.apache.tuscany.spi.model.ElementInfo;
import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Sequence;
+import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
@@ -37,11 +44,10 @@
public class SDOWrapperHandler implements WrapperHandler<Object> {
/**
- * @see org.apache.tuscany.spi.databinding.WrapperHandler#create(ElementInfo,
- * TransformationContext)
+ * @see org.apache.tuscany.spi.databinding.WrapperHandler#create(ElementInfo, TransformationContext)
*/
public Object create(ElementInfo element, TransformationContext context) {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
QName typeName = element.getType().getQName();
DataFactory dataFactory = helperContext.getDataFactory();
DataObject root = dataFactory.create(typeName.getNamespaceURI(), typeName.getLocalPart());
@@ -50,23 +56,44 @@
}
/**
- * @see org.apache.tuscany.spi.databinding.WrapperHandler#getChild(java.lang.Object,
- * int, ElementInfo)
+ * @see org.apache.tuscany.spi.databinding.WrapperHandler#setChild(java.lang.Object, int, ElementInfo,
+ * java.lang.Object)
*/
- public Object getChild(Object wrapper, int i, ElementInfo element) {
+ public void setChild(Object wrapper, int i, ElementInfo childElement, Object value) {
DataObject wrapperDO =
(wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
- return wrapperDO.get(element.getQName().getLocalPart());
+ wrapperDO.set(i, value);
}
- /**
- * @see org.apache.tuscany.spi.databinding.WrapperHandler#setChild(java.lang.Object,
- * int, ElementInfo, java.lang.Object)
- */
- public void setChild(Object wrapper, int i, ElementInfo childElement, Object value) {
+ @SuppressWarnings("unchecked")
+ public List getChildren(Object wrapper) {
DataObject wrapperDO =
(wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
- wrapperDO.set(childElement.getQName().getLocalPart(), value);
+ List<Property> properties = wrapperDO.getInstanceProperties();
+ List<Object> elements = new ArrayList<Object>();
+ Type type = wrapperDO.getType();
+ if (type.isSequenced()) {
+ // Add values in the sequence
+ Sequence sequence = wrapperDO.getSequence();
+ for (int i = 0; i < sequence.size(); i++) {
+ // Skip mixed text
+ if (sequence.getProperty(i) != null) {
+ elements.add(sequence.getValue(i));
+ }
+ }
+ } else {
+ for (Property p : properties) {
+ Object child = wrapperDO.get(p);
+ if (p.isMany()) {
+ for (Object c : (Collection<?>)child) {
+ elements.add(c);
+ }
+ } else {
+ elements.add(child);
+ }
+ }
+ }
+ return elements;
}
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java Sat Mar 17 17:49:08 2007
@@ -35,7 +35,7 @@
public DataObject transform(String source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
return xmlHelper.load(source).getRootObject();
} catch (Exception e) {
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java Sat Mar 17 17:49:08 2007
@@ -37,7 +37,7 @@
public String transform(XMLDocument source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLHelper xmlHelper = helperContext.getXMLHelper();
StringWriter writer = new StringWriter();
xmlHelper.save(source, writer, null);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java Sat Mar 17 17:49:08 2007
@@ -43,7 +43,7 @@
*/
public XMLStreamReader transform(XMLDocument source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
return streamHelper.createXMLStreamReader(source);
} catch (XMLStreamException e) {
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java Sat Mar 17 17:49:08 2007
@@ -39,7 +39,7 @@
public DataObject transform(XMLStreamReader source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
// The XMLStreamHelper requires that the reader is posistioned at
// START_ELEMENT
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java Sat Mar 17 17:49:08 2007
@@ -38,7 +38,7 @@
public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
try {
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ HelperContext helperContext = SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
return streamHelper.load(source);
} catch (Exception e) {
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl?view=diff&rev=519492&r1=519491&r2=519492
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl Sat Mar 17 17:49:08 2007
@@ -1,21 +1,21 @@
<?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.
+ * 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.
-->
<!--
SDO databinding extension
@@ -24,45 +24,48 @@
$Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="org.apache.tuscany.databinding.sdo.include">
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+ name="org.apache.tuscany.databinding.sdo.include" autowire="true">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.services.databinding</group>
<name>databinding-sdo</name>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
</dependency>
-
+
<!-- import.sdo element loader implementations -->
<component name="elementLoader.import.sdo">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader" />
</component>
-
+
<component name="databinding.sdo">
<system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" />
- </component>
+ </component>
<component name="transformer.DataObject2String">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String" />
</component>
<component name="transformer.DataObject2XMLStreamReader">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader" />
</component>
<component name="transformer.XMLDocument2String">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String" />
</component>
<component name="transformer.String2DataObject">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject" />
</component>
<component name="transformer.XMLDocument2XMLStreamReader">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader" />
</component>
<component name="transformer.XMLStreamReader2DataObject">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject" />
</component>
<component name="transformer.XMLStreamReader2XMLDocument">
- <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument" />
</component>
-
+
+ <component name="helperContext.processor">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.HelperContextProcessor" />
+ </component>
+
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org