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/06/06 04:18:20 UTC

svn commit: r544709 - in /incubator/tuscany/java/sca/modules/databinding-xmlbeans: ./ src/main/java/org/apache/tuscany/databinding/xmlbeans/ src/main/resources/META-INF/sca/

Author: rfeng
Date: Tue Jun  5 19:18:19 2007
New Revision: 544709

URL: http://svn.apache.org/viewvc?view=rev&rev=544709
Log:
Port databinding-xmlbeans to trunk

Added:
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/
      - copied from r544696, incubator/tuscany/sandbox/old/contrib/databinding-xmlbeans/
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml   (with props)
Removed:
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml.off
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/resources/META-INF/sca/
Modified:
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java
    incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java

Added: incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml?view=auto&rev=544709
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml (added)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml Tue Jun  5 19:18:19 2007
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-databinding-xmlbeans</artifactId>
+    <name>Apache Tuscany Data Binding for XmlBeans</name>
+    <description>Tuscany XmlBeans Data Binding</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>2.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/xmlbeans-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-xmlbeans</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean"
+                                    classpathref="maven.compile.classpath" />
+                                <xmlbean schema="${basedir}/src/test/resources" classpathref="maven.compile.classpath"
+                                    destfile="${project.build.directory}/ipo-xmlbeans.jar"
+                                    srcgendir="${project.build.directory}/xmlbeans-source" javasource="1.5"
+                                    classgendir="${project.build.directory}/test-classes" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java?view=diff&rev=544709&r1=544696&r2=544709
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java Tue Jun  5 19:18:19 2007
@@ -18,18 +18,15 @@
  */
 package org.apache.tuscany.databinding.xmlbeans;
 
-import org.apache.tuscany.spi.databinding.PullTransformer;
-import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
-import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
-import org.osoa.sca.annotations.Service;
 import org.w3c.dom.Node;
 
-@Service(Transformer.class)
-public class Node2XmlObject extends TransformerExtension<Node, XmlObject> implements
+public class Node2XmlObject extends BaseTransformer<Node, XmlObject> implements
     PullTransformer<Node, XmlObject> {
     // private XmlOptions options;
 

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java?view=diff&rev=544709&r1=544696&r2=544709
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java Tue Jun  5 19:18:19 2007
@@ -19,13 +19,13 @@
 
 package org.apache.tuscany.databinding.xmlbeans;
 
-import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
+import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
 import org.apache.xmlbeans.XmlObject;
 
 /**
  * XMLBeans DataBinding
  */
-public class XMLBeansDataBinding extends DataBindingExtension {
+public class XMLBeansDataBinding extends BaseDataBinding {
     public static final String NAME = XmlObject.class.getName();
     
     public XMLBeansDataBinding() {

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java?view=diff&rev=544709&r1=544696&r2=544709
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java Tue Jun  5 19:18:19 2007
@@ -20,17 +20,14 @@
 
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.databinding.PullTransformer;
-import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
-import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
-import org.osoa.sca.annotations.Service;
 
-@Service(Transformer.class)
-public class XMLStreamReader2XmlObject extends TransformerExtension<XMLStreamReader, XmlObject> implements PullTransformer<XMLStreamReader, XmlObject> {
+public class XMLStreamReader2XmlObject extends BaseTransformer<XMLStreamReader, XmlObject> implements PullTransformer<XMLStreamReader, XmlObject> {
     // private XmlOptions options;
 
     public XmlObject transform(XMLStreamReader source, TransformationContext context) {

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java?view=diff&rev=544709&r1=544696&r2=544709
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java Tue Jun  5 19:18:19 2007
@@ -18,16 +18,16 @@
  */
 package org.apache.tuscany.databinding.xmlbeans;
 
-import org.apache.tuscany.spi.databinding.PullTransformer;
-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.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.Transformer;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
 import org.apache.xmlbeans.XmlObject;
 import org.osoa.sca.annotations.Service;
 import org.w3c.dom.Node;
 
 @Service(Transformer.class)
-public class XmlObject2Node extends TransformerExtension<XmlObject, Node> implements
+public class XmlObject2Node extends BaseTransformer<XmlObject, Node> implements
     PullTransformer<XmlObject, Node> {
     // private XmlOptions options;
 

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java?view=diff&rev=544709&r1=544696&r2=544709
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java Tue Jun  5 19:18:19 2007
@@ -20,12 +20,12 @@
 
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.spi.databinding.PullTransformer;
-import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
 import org.apache.xmlbeans.XmlObject;
 
-public class XmlObject2XMLStreamReader extends TransformerExtension<XmlObject, XMLStreamReader> implements PullTransformer<XmlObject, XMLStreamReader> {
+public class XmlObject2XMLStreamReader extends BaseTransformer<XmlObject, XMLStreamReader> implements PullTransformer<XmlObject, XMLStreamReader> {
     // private XmlOptions options;
     
     public XMLStreamReader transform(XmlObject source, TransformationContext context) {



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org