svn commit: r549178 - in /incubator/tuscany/branches/sca-java-0.91/modules: databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/ databinding-sdo/ databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ databindin...

[sv...@apache.org]

Author: svkrish
Date: Wed Jun 20 11:26:27 2007
New Revision: 549178

URL: http://svn.apache.org/viewvc?view=rev&rev=549178
Log:
fixes to roll back sdo dependency to beta1 release

Modified:
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/pom.xml
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
    incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
    incubator/tuscany/branches/sca-java-0.91/modules/java2wsdl/pom.xml

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java Wed Jun 20 11:26:27 2007
@@ -34,7 +34,7 @@
 import org.apache.tuscany.sca.interfacedef.DataType;
 import org.apache.tuscany.sdo.impl.AttributeImpl;
 import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.util.SDOUtil;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EReference;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java Wed Jun 20 11:26:27 2007
@@ -32,8 +32,8 @@
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/pom.xml?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/pom.xml Wed Jun 20 11:26:27 2007
@@ -45,15 +45,15 @@
             <artifactId>tuscany-implementation-java-xml</artifactId>
             <version>0.91-incubating-SNAPSHOT</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-lib</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
-        </dependency>                    
+        </dependency-->                    
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.0-incubating-SNAPSHOT</version>
+            <version>1.0-incubating-beta1</version>
         </dependency>
     </dependencies>
 
@@ -81,7 +81,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sdo</groupId>
                 <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>1.0-incubating-beta1</version>
                 <executions>
                     <execution>
                         <id>generate-po-sdo</id>

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java Wed Jun 20 11:26:27 2007
@@ -26,8 +26,9 @@
 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.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java Wed Jun 20 11:26:27 2007
@@ -38,11 +38,12 @@
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.util.SDOUtil;
 
 import commonj.sdo.helper.HelperContext;
 import commonj.sdo.helper.XSDHelper;
 import commonj.sdo.impl.HelperProvider;
+
 
 /**
  * Loader that handles &lt;import.sdo&gt; elements.

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java Wed Jun 20 11:26:27 2007
@@ -27,7 +27,7 @@
 import org.apache.tuscany.sca.databinding.TransformationContext;
 import org.apache.tuscany.sca.interfacedef.DataType;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.util.SDOUtil;
 
 import commonj.sdo.helper.HelperContext;
 import commonj.sdo.impl.HelperProvider;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java Wed Jun 20 11:26:27 2007
@@ -23,7 +23,8 @@
 
 import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
 import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
 
 import commonj.sdo.Type;
 import commonj.sdo.helper.HelperContext;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java Wed Jun 20 11:26:27 2007
@@ -25,8 +25,9 @@
 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.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
 
 import commonj.sdo.helper.HelperContext;
 import commonj.sdo.helper.XMLDocument;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java Wed Jun 20 11:26:27 2007
@@ -25,8 +25,8 @@
 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.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java Wed Jun 20 11:26:27 2007
@@ -24,8 +24,9 @@
 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.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
 
 import commonj.sdo.helper.HelperContext;
 import commonj.sdo.helper.XMLDocument;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java Wed Jun 20 11:26:27 2007
@@ -22,7 +22,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
 
 import commonj.sdo.helper.HelperContext;
 import commonj.sdo.helper.XMLDocument;

Modified: incubator/tuscany/branches/sca-java-0.91/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.91/modules/java2wsdl/pom.xml?view=diff&rev=549178&r1=549177&r2=549178
==============================================================================
--- incubator/tuscany/branches/sca-java-0.91/modules/java2wsdl/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-0.91/modules/java2wsdl/pom.xml Wed Jun 20 11:26:27 2007
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.0-incubating-beta1</version>
+            <version>1.0-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -159,7 +159,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sdo</groupId>
                 <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.0-incubating-beta1</version>
+                <version>1.0-incubating-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>generate-sdo</id>



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