tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r500608 - in /incubator/tuscany/java: samples/sca/ samples/sca/helloworldws/ samples/sca/helloworldwsclient/ sca/extensions/ sca/extensions/axis2/ sca/extensions/axis2/binding/ sca/extensions/axis2/binding/src/ sca/extensions/axis2/binding/...
Date Sat, 27 Jan 2007 20:12:22 GMT
Author: antelder
Date: Sat Jan 27 12:12:20 2007
New Revision: 500608

URL: http://svn.apache.org/viewvc?view=rev&rev=500608
Log:
Move Axis2 things to new sca/extensions folder

Added:
    incubator/tuscany/java/sca/extensions/
    incubator/tuscany/java/sca/extensions/axis2/
    incubator/tuscany/java/sca/extensions/axis2/binding/
      - copied from r499713, incubator/tuscany/java/sca/services/bindings/binding.axis2/
    incubator/tuscany/java/sca/extensions/axis2/binding/.ruleset
      - copied unchanged from r500599, incubator/tuscany/java/sca/services/bindings/binding.axis2/.ruleset
    incubator/tuscany/java/sca/extensions/axis2/binding/LICENSE.txt
      - copied unchanged from r500599, incubator/tuscany/java/sca/services/bindings/binding.axis2/LICENSE.txt
    incubator/tuscany/java/sca/extensions/axis2/binding/NOTICE.txt
      - copied unchanged from r500599, incubator/tuscany/java/sca/services/bindings/binding.axis2/NOTICE.txt
    incubator/tuscany/java/sca/extensions/axis2/binding/pom.xml
      - copied, changed from r500599, incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/binding/src/
      - copied from r500599, incubator/tuscany/java/sca/services/bindings/binding.axis2/src/
    incubator/tuscany/java/sca/extensions/axis2/databinding/
      - copied from r499713, incubator/tuscany/java/sca/services/databinding/databinding-axiom/
    incubator/tuscany/java/sca/extensions/axis2/databinding/.ruleset
      - copied unchanged from r500599, incubator/tuscany/java/sca/services/databinding/databinding-axiom/.ruleset
    incubator/tuscany/java/sca/extensions/axis2/databinding/LICENSE.txt
      - copied unchanged from r500599, incubator/tuscany/java/sca/services/databinding/databinding-axiom/LICENSE.txt
    incubator/tuscany/java/sca/extensions/axis2/databinding/NOTICE.txt
      - copied unchanged from r500599, incubator/tuscany/java/sca/services/databinding/databinding-axiom/NOTICE.txt
    incubator/tuscany/java/sca/extensions/axis2/databinding/pom.xml
      - copied, changed from r500599, incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/databinding/src/
      - copied from r500599, incubator/tuscany/java/sca/services/databinding/databinding-axiom/src/
    incubator/tuscany/java/sca/extensions/axis2/pom.xml   (with props)
    incubator/tuscany/java/sca/extensions/axis2/samples/
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/
      - copied from r499713, incubator/tuscany/java/samples/sca/helloworldws/
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/pom.xml
      - copied, changed from r500599, incubator/tuscany/java/samples/sca/helloworldws/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/
      - copied from r500599, incubator/tuscany/java/samples/sca/helloworldws/src/
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/
      - copied from r500526, incubator/tuscany/java/samples/sca/helloworldwsclient/
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/pom.xml
      - copied, changed from r500599, incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/run.bat
      - copied unchanged from r500599, incubator/tuscany/java/samples/sca/helloworldwsclient/run.bat
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/run_celtix.bat
      - copied unchanged from r500599, incubator/tuscany/java/samples/sca/helloworldwsclient/run_celtix.bat
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/
      - copied from r500599, incubator/tuscany/java/samples/sca/helloworldwsclient/src/
    incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml   (with props)
    incubator/tuscany/java/sca/extensions/axis2/tools/
      - copied from r499713, incubator/tuscany/java/sca/tools/
    incubator/tuscany/java/sca/extensions/axis2/tools/pom.xml
      - copied, changed from r500599, incubator/tuscany/java/sca/tools/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/tools/src/
      - copied from r500599, incubator/tuscany/java/sca/tools/src/
    incubator/tuscany/java/sca/extensions/pom.xml   (with props)
Removed:
    incubator/tuscany/java/samples/sca/helloworldws/
    incubator/tuscany/java/samples/sca/helloworldwsclient/
    incubator/tuscany/java/sca/services/bindings/binding.axis2/
    incubator/tuscany/java/sca/services/databinding/databinding-axiom/
    incubator/tuscany/java/sca/tools/
Modified:
    incubator/tuscany/java/samples/sca/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java
    incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/binding.axis2.scdl
    incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/default.scdl
    incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
    incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
    incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
    incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl
    incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldService.java
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/webapp/WEB-INF/default.scdl
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/sca/services/bindings/pom.xml
    incubator/tuscany/java/sca/services/databinding/pom.xml

Modified: incubator/tuscany/java/samples/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/pom.xml?view=diff&rev=500608&r1=500607&r2=500608
==============================================================================
--- incubator/tuscany/java/samples/sca/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/pom.xml Sat Jan 27 12:12:20 2007
@@ -70,8 +70,6 @@
         <module>calculator</module>
         <module>webapp</module>
         <!-- module>echo.databinding</module -->
-        <module>helloworldwsclient</module>
-        <module>helloworldws</module>
         <module>helloworldwsclient-async</module>
         <module>helloworldws-async</module>
         <!-- module>helloworldjsonrpc</module -->

Copied: incubator/tuscany/java/sca/extensions/axis2/binding/pom.xml (from r500599, incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/binding/pom.xml?view=diff&rev=500608&p1=incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml&r1=500599&p2=incubator/tuscany/java/sca/extensions/axis2/binding/pom.xml&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/axis2/binding/pom.xml Sat Jan 27 12:12:20 2007
@@ -19,37 +19,29 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>axis2</artifactId>
+    <artifactId>tuscany-axis2-binding</artifactId>
     <name>Apache Tuscany Binding for Axis2</name>
-    <description>Implementation of the SCA Web Services binding using Axis2.</description>
-
-    <repositories>
-        <repository>
-            <id>apache.ws</id>
-            <name>Apache WebServices Repository</name>
-            <url>http://ws.zones.apache.org/repository/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
+    <description>Implementation of the SCA Web Services binding using Axis2</description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca.services.idl</groupId>
             <artifactId>wsdl</artifactId>
-            <version>${sca.version}</version>
+            <version>${tuscanyKernelVersion}</version>
             <scope>compile</scope>
         </dependency>
 
         <!-- A hack to bring in databinding-axiom transitively -->
         <dependency>
-            <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+            <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
             <artifactId>databinding-axiom</artifactId>
-            <version>${sca.version}</version>
+            <version>${extensionVersion}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -58,20 +50,10 @@
             <artifactId>servlet-api</artifactId>
         </dependency>
 
-        <!-- Axis2 1.1 release -->
-
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
-
         </dependency>
-<!--        
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>addressing</artifactId>
-            <package>mar</package>
-        </dependency>
--->
 
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
@@ -86,8 +68,6 @@
         <dependency>
             <groupId>incubator-woden</groupId>
             <artifactId>woden</artifactId>
-            <version>1.0.0M6</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -98,15 +78,11 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>2.0</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -117,42 +93,28 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
-            <version>2.2</version>
-            <scope>runtime</scope>
         </dependency>
 
-
-        <!-- end axis 2.0 SNAPSHOT  -->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>httpcomponents-httpcore</groupId>
             <artifactId>jakarta-httpcore</artifactId>
-            <version>4.0-alpha2</version>
-            <scope>runtime</scope>
         </dependency>
 
-        <!-- end Axis2 1.1 release  -->
-
         <!-- test dependencies -->
         <dependency>
             <groupId>org.easymock</groupId>
@@ -162,8 +124,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>test</artifactId>
-				<version>0.1-pre-spec-SNAPSHOT</version>
-            <scope>test</scope>
         </dependency>
+
     </dependencies>
 </project>

Modified: incubator/tuscany/java/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java (original)
+++ incubator/tuscany/java/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java Sat Jan 27 12:12:20 2007
@@ -89,6 +89,7 @@
 
     }
 
+    @SuppressWarnings("deprecation")
     protected OperationClient createOperationClient(Object[] args) throws AxisFault {
         SOAPEnvelope env = soapFactory.getDefaultEnvelope();
         if (args != null && args.length > 0) {

Modified: incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/binding.axis2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/binding.axis2.scdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/binding.axis2.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/binding.axis2.scdl Sat Jan 27 12:12:20 2007
@@ -22,13 +22,13 @@
     name="org.apache.tuscany.binding.axis2.include">
 
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.bindings</group>
-        <name>axis2</name>
+        <group>org.apache.tuscany.sca.extensions.axis2</group>
+        <name>tuscany-axis2-binding</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>
-
+    
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.databinding</group>
+        <group>org.apache.tuscany.sca.extensions.axis2</group>
         <name>databinding-axiom</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>

Modified: incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/default.scdl Sat Jan 27 12:12:20 2007
@@ -23,13 +23,13 @@
            name="org.apache.tuscany.binding.axis2.WebServiceBinding">
 
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.bindings</group>
-        <name>axis2</name>
+        <group>org.apache.tuscany.sca.extensions.axis2</group>
+        <name>tuscany-axis2-binding</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>
     
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.databinding</group>
+        <group>org.apache.tuscany.sca.extensions.axis2</group>
         <name>databinding-axiom</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>

Modified: incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java Sat Jan 27 12:12:20 2007
@@ -76,6 +76,7 @@
         assertTrue(asyncTargetInvoker instanceof Axis2AsyncTargetInvoker);
     }
 
+    @SuppressWarnings("unchecked")
     private Axis2ReferenceBinding createAxis2Reference(String webAppName, String serviceName) throws Exception {
         //Create WebServiceBindingDefinition
         String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";

Modified: incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java Sat Jan 27 12:12:20 2007
@@ -70,6 +70,7 @@
         axis2Service.start();
     }
 
+    @SuppressWarnings("unchecked")
     private Axis2ServiceBinding createAxis2Service(String serviceName, ServletHost tomcatHost, boolean callback)
         throws Exception {
         //Create WebServiceBindingDefinition

Copied: incubator/tuscany/java/sca/extensions/axis2/databinding/pom.xml (from r500599, incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/databinding/pom.xml?view=diff&rev=500608&p1=incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml&r1=500599&p2=incubator/tuscany/java/sca/extensions/axis2/databinding/pom.xml&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/axis2/databinding/pom.xml Sat Jan 27 12:12:20 2007
@@ -19,22 +19,23 @@
 -->
 <project>
 	<parent>
-		<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+		<groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0-incubator-SNAPSHOT</version>
 	</parent>
+
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>databinding-axiom</artifactId>
 	<name>Apache Tuscany Data Binding for Axiom</name>
 	<description>Tuscany Axiom Data Binding</description>
 
 	<dependencies>
+
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-spi</artifactId>
-				<version>0.1-pre-spec-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
@@ -49,7 +50,6 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
         </dependency>
 
         <dependency>
@@ -57,6 +57,7 @@
             <artifactId>axiom-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -66,12 +67,12 @@
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
         </dependency>
+
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
         </dependency>		
-	</dependencies>
+
+   </dependencies>
 
 </project>

Modified: incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java (original)
+++ incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java Sat Jan 27 12:12:20 2007
@@ -26,7 +26,6 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.tuscany.api.TuscanyRuntimeException;
 import org.apache.tuscany.spi.databinding.DataBinding;
 import org.apache.tuscany.spi.databinding.WrapperHandler;
 import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;

Modified: incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/databinding.axiom.scdl Sat Jan 27 12:12:20 2007
@@ -21,11 +21,11 @@
 <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.axiom.include">
 
-    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.databinding</group>
-        <name>databinding-axiom</name>
-        <version>1.0-incubator-SNAPSHOT</version>
-    </dependency>
+    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
+        <group>org.apache.tuscany.sca.extensions.axis2</group>
+        <name>databinding-axiom</name>
+        <version>1.0-incubator-SNAPSHOT</version>
+    </dependency>
 
     <component name="databinding.axiom">
         <system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />

Modified: incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/default.scdl Sat Jan 27 12:12:20 2007
@@ -21,7 +21,7 @@
     name="org.apache.tuscany.databinding.axiom">
 
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.databinding</group>
+        <group>org.apache.tuscany.sca.extensions.axis2</group>
         <name>databinding-axiom</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>

Added: incubator/tuscany/java/sca/extensions/axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/pom.xml?view=auto&rev=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/axis2/pom.xml Sat Jan 27 12:12:20 2007
@@ -0,0 +1,146 @@
+<?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>
+
+    <parent>
+        <groupId>org.apache.tuscany.sca.extensions</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0-incubator-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
+    <artifactId>parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany SCA Extensions for Axis2</name>
+
+    <repositories>
+        <repository>
+            <id>apache.ws</id>
+            <name>Apache WebServices Repository</name>
+            <url>http://ws.zones.apache.org/repository/</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+
+    <modules>
+        <module>binding</module>
+        <module>databinding</module>
+        <module>tools</module>
+        <module>samples</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-kernel</artifactId>
+                <version>1.1.1</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+                <version>1.2.2</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-impl</artifactId>
+                <version>1.2.2</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>incubator-woden</groupId>
+               <artifactId>woden</artifactId>
+               <version>1.0.0M6</version>
+               <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>commons-logging</groupId>
+               <artifactId>commons-logging</artifactId>
+               <version>1.1</version>
+               <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>2.0</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.ws.commons.schema</groupId>
+               <artifactId>XmlSchema</artifactId>
+               <version>1.2</version>
+               <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>commons-httpclient</groupId>
+               <artifactId>commons-httpclient</artifactId>
+               <version>3.0.1</version>
+               <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>javax.mail</groupId>
+               <artifactId>mail</artifactId>
+               <version>1.4</version>
+               <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>backport-util-concurrent</groupId>
+               <artifactId>backport-util-concurrent</artifactId>
+               <version>2.2</version>
+               <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>commons-codec</groupId>
+               <artifactId>commons-codec</artifactId>
+               <version>1.3</version>
+               <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>httpcomponents-httpcore</groupId>
+               <artifactId>jakarta-httpcore</artifactId>
+               <version>4.0-alpha2</version>
+               <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>xerces</groupId>
+               <artifactId>xercesImpl</artifactId>
+               <version>2.8.1</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>

Propchange: incubator/tuscany/java/sca/extensions/axis2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/extensions/axis2/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/extensions/axis2/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/pom.xml (from r500599, incubator/tuscany/java/samples/sca/helloworldws/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/pom.xml?view=diff&rev=500608&p1=incubator/tuscany/java/samples/sca/helloworldws/pom.xml&r1=500599&p2=incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/pom.xml&r2=500608
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/pom.xml Sat Jan 27 12:12:20 2007
@@ -19,10 +19,11 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.axis2.samples</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sample-helloworldws</artifactId>
     <packaging>war</packaging>
@@ -35,63 +36,24 @@
         <dependency>
             <groupId>org.osoa</groupId>
             <artifactId>sca-api-r0.95</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
         </dependency>
         
         <!-- Tuscany API dependencies -->
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-api</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- SDO API dependencies  -->
-        <dependency>
-            <groupId>commonj</groupId>
-            <artifactId>sdo-api-r2.1</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <!-- SDO's XXXHelper.INSTANCE pattern requires the implementation -->
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- SDO's XMLStreamHelper requires StAX API and impl (it's not pulled by 
-        tuscany-sdo-impl because the maven dependency scope is provided -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.0.1</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- runtime is need for webapp integration to include jar -->
         <dependency>
             <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
             <artifactId>webapp-api</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- Unit testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>
@@ -103,6 +65,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
                 <artifactId>tuscany-war-plugin</artifactId>
+                <version>${tuscanyKernelVersion}</version>
                 <executions>
                     <execution>
                         <id>tuscany-war</id>
@@ -117,14 +80,9 @@
                     <loadExtensionDependencies>true</loadExtensionDependencies>
                     <extensions>
                         <dependency>
-                            <groupId>org.apache.tuscany.sca.services.bindings</groupId>
-                            <artifactId>axis2</artifactId>
-                            <version>${tuscanyVersion}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.tuscany.sca.services.databinding</groupId>
-                            <artifactId>databinding-sdo</artifactId>
-                            <version>${tuscanyVersion}</version>
+                            <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
+                            <artifactId>tuscany-axis2-binding</artifactId>
+                            <version>${extensionVersion}</version>
                         </dependency>
                     </extensions>
                 </configuration>

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldImpl.java?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldImpl.java (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldImpl.java Sat Jan 27 12:12:20 2007
@@ -20,8 +20,6 @@
 
 import org.osoa.sca.annotations.Service;
 
-import commonj.sdo.DataObject;
-
 /**
  * This class implements the HelloWorld service.
  */
@@ -30,12 +28,6 @@
 
     public String getGreetings(String name) {
         return "Hello " + name;
-    }
-
-    public String getGreetings1(DataObject name) {
-        String firstName = name.getString("firstName");
-        String lastName = name.getString("lastName");
-        return "Hello " + firstName + " " + lastName;
     }
 
 }

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldService.java?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldService.java (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/java/helloworld/HelloWorldService.java Sat Jan 27 12:12:20 2007
@@ -18,12 +18,9 @@
  */
 package helloworld;
 
-import org.apache.tuscany.api.annotation.DataType;
 import org.osoa.sca.annotations.Remotable;
 import org.osoa.sca.annotations.Service;
 
-import commonj.sdo.DataObject;
-
 /**
  * This is the business interface of the HelloWorld greetings service.
  */
@@ -32,8 +29,5 @@
 public interface HelloWorldService {
 
     public String getGreetings(String name);
-    @DataType(name="commonj.sdo.DataObject")
-    public String getGreetings1(DataObject name);
-
 }
 

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/resources/wsdl/helloworld.wsdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/resources/wsdl/helloworld.wsdl Sat Jan 27 12:12:20 2007
@@ -39,30 +39,6 @@
                 </complexType>
             </element>
             
-            <element name="getGreetings1">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="tns:NameType">
-                        </element>			
-                    </sequence>
-                </complexType>
-            </element>
-            
-           	<complexType name="NameType">
-           		<sequence>
-           			<element name="firstName" type="string"/>
-           			<element name="lastName" type="string"/>
-           		</sequence>
-           	</complexType>            
-
-            <element name="getGreetings1Response">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-                        
         </schema>
     </wsdl:types>
 
@@ -74,23 +50,11 @@
         <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
     </wsdl:message>
 
-    <wsdl:message name="getGreetings1Request">
-        <wsdl:part element="tns:getGreetings1" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetings1Response">
-        <wsdl:part element="tns:getGreetings1Response" name="parameters"/>
-    </wsdl:message>
-
     <wsdl:portType name="HelloWorld">
         <wsdl:operation name="getGreetings">
             <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
             <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
         </wsdl:operation>
-        <wsdl:operation name="getGreetings1">
-            <wsdl:input message="tns:getGreetings1Request" name="getGreetings1Request"/>
-            <wsdl:output message="tns:getGreetings1Response" name="getGreetings1Response"/>
-        </wsdl:operation>
     </wsdl:portType>
 
     <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
@@ -104,16 +68,6 @@
                 <wsdlsoap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
-        <wsdl:operation name="getGreetings1">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetings1Request">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetings1Response">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-
     </wsdl:binding>
 
     <wsdl:service name="HelloWorldService">

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/webapp/WEB-INF/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/webapp/WEB-INF/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldws/src/main/webapp/WEB-INF/default.scdl Sat Jan 27 12:12:20 2007
@@ -20,10 +20,9 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
     name="helloworldws">
     
-    <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" location="wsdl/helloworld.wsdl" />
-
     <service name="HelloWorldWebService">
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" />
+        <interface.java class="helloworld.HelloWorldService" />
+        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" / -->
         <binding.ws endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)" location="wsdl/helloworld.wsdl" />
         <reference>HelloWorldServiceComponent</reference>
     </service>

Copied: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/pom.xml (from r500599, incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/pom.xml?view=diff&rev=500608&p1=incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml&r1=500599&p2=incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/pom.xml&r2=500608
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/pom.xml Sat Jan 27 12:12:20 2007
@@ -19,99 +19,38 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.axis2.samples</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sample-helloworldwsclient</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Web Service Client Sample</name>
     <description>A sample client for a HelloWorld Web Service.</description>
-    <properties>
-        <ws.type>axis2</ws.type>
-    </properties>
 
     <dependencies>
 
         <dependency>
-            <groupId>commonj</groupId>
-            <artifactId>sdo-api-r2.1</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>org.osoa</groupId>
             <artifactId>sca-api-r0.95</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-api</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- SDO's XXXHelper.INSTANCE pattern requires the implementation -->
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- SDO's XMLStreamHelper requires StAX API and impl (it's not pulled by 
-            tuscany-sdo-impl because the maven dependency scope is provided -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.0.1</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>core</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.services.bindings</groupId>
-            <artifactId>axis2</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>test</scope>
+            <artifactId>tuscany-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>test</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.services.databinding</groupId>
-            <artifactId>databinding-sdo</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.services.databinding</groupId>
-            <artifactId>databinding-axiom</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>
+
     <build>
-        <finalName>sample-helloworldwsclient-1.0-incubator-SNAPSHOT</finalName>
+        <finalName>sample-helloworldwsclient</finalName>
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
@@ -128,50 +67,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
-                <artifactId>tuscany-standalone-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>tuscany-standalone</id>
-                        <goals>
-                            <goal>tuscany-standalone</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- Set to true to embed external jars for extensions in the WAR -->
-                    <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
-                    <loadExtensionDependencies>true</loadExtensionDependencies>
-                    <overwrite>true</overwrite>
-                    <extensions>
-                        <dependency>
-                            <groupId>org.apache.tuscany.sca.services.bindings</groupId>
-                            <artifactId>axis2</artifactId>
-                            <version>${tuscanyVersion}</version>
-                        </dependency>
-                        <!-- HACK: comment out databinding-axiom extension to work around the inter-extension
-                            dependency issue -->
-                        <!-- 
-                            <dependency>
-                            <groupId>org.apache.tuscany.sca.services.idl</groupId>
-                            <artifactId>wsdl</artifactId>
-                            <version>${tuscanyVersion}</version>
-                            </dependency>
-                            <dependency>
-                            <groupId>org.apache.tuscany.sca.services.databinding</groupId>
-                            <artifactId>databinding-axiom</artifactId>
-                            <version>${tuscanyVersion}</version>
-                            </dependency>
-                        -->
-                        <dependency>
-                            <groupId>org.apache.tuscany.sca.services.databinding</groupId>
-                            <artifactId>databinding-sdo</artifactId>
-                            <version>${tuscanyVersion}</version>
-                        </dependency>
-                    </extensions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl Sat Jan 27 12:12:20 2007
@@ -21,17 +21,16 @@
            xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
            name="helloworldwsclient">
     
-    <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" location="wsdl/helloworld.wsdl"/>
-    
     <component name="HelloWorldServiceComponent">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
       <reference name="helloWorldService">HelloWorldService</reference>
     </component>
 
     <reference name="HelloWorldService">
-        <interface.wsdl xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" 
+        <interface.java class="helloworld.HelloWorldService" />
+        <!-- interface.wsdl xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" 
             interface="http://helloworld#wsdl.interface(HelloWorld)" 
-            wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" />
+            wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" / -->
         <binding.ws endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
 			location="wsdl/helloworld.wsdl" />
     </reference>

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl?view=diff&rev=500608&r1=500599&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl Sat Jan 27 12:12:20 2007
@@ -39,30 +39,6 @@
                 </complexType>
             </element>
             
-            <element name="getGreetings1">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="tns:NameType">
-                        </element>			
-                    </sequence>
-                </complexType>
-            </element>
-            
-           	<complexType name="NameType">
-           		<sequence>
-           			<element name="firstName" type="string"/>
-           			<element name="lastName" type="string"/>
-           		</sequence>
-           	</complexType>            
-
-            <element name="getGreetings1Response">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-                        
         </schema>
     </wsdl:types>
 
@@ -74,23 +50,11 @@
         <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
     </wsdl:message>
 
-    <wsdl:message name="getGreetings1Request">
-        <wsdl:part element="tns:getGreetings1" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetings1Response">
-        <wsdl:part element="tns:getGreetings1Response" name="parameters"/>
-    </wsdl:message>
-
     <wsdl:portType name="HelloWorld">
         <wsdl:operation name="getGreetings">
             <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
             <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
         </wsdl:operation>
-        <wsdl:operation name="getGreetings1">
-            <wsdl:input message="tns:getGreetings1Request" name="getGreetings1Request"/>
-            <wsdl:output message="tns:getGreetings1Response" name="getGreetings1Response"/>
-        </wsdl:operation>
     </wsdl:portType>
 
     <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
@@ -104,16 +68,6 @@
                 <wsdlsoap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
-        <wsdl:operation name="getGreetings1">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetings1Request">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetings1Response">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-
     </wsdl:binding>
 
     <wsdl:service name="HelloWorldService">

Added: incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml?view=auto&rev=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml Sat Jan 27 12:12:20 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>
+
+    <parent>
+        <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0-incubator-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.sca.extensions.axis2.samples</groupId>
+    <artifactId>parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Samples for the Axis2 extension</name>
+
+    <!-- definition of repositories where the parent pom can be found -->
+    <repositories>
+        <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>apache.incubator</id>
+            <name>Apache Incubator Repository</name>
+            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <modules>
+        <module>helloworldws</module>
+        <module>helloworldwsclient</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.apache.tuscany.distribution.sca</groupId>
+                            <artifactId>standalone</artifactId>
+                            <version>${scaImplVersion}</version>
+                            <classifier>bin</classifier>
+                            <type>zip</type>
+                        </artifactItem>
+                    </artifactItems>
+                    <outputDirectory>${project.build.directory}/distribution</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.osoa</groupId>
+                <artifactId>sca-api-r${specVersion}</artifactId>
+                <version>${scaVersion}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>test</artifactId>
+                <version>${scaImplVersion}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>

Propchange: incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/extensions/axis2/samples/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/tuscany/java/sca/extensions/axis2/tools/pom.xml (from r500599, incubator/tuscany/java/sca/tools/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/tools/pom.xml?view=diff&rev=500608&p1=incubator/tuscany/java/sca/tools/pom.xml&r1=500599&p2=incubator/tuscany/java/sca/extensions/axis2/tools/pom.xml&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/axis2/tools/pom.xml Sat Jan 27 12:12:20 2007
@@ -19,14 +19,14 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sca-tools</artifactId>
-    <name>Apache Tuscany SCA Tools</name>
-    <description>SCA Tools.</description>
+    <name>Apache Tuscany Axis2 SCA Tools</name>
+    <description>Axis2 SCA Tools</description>
 
     <repositories>
         <repository>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>${sca.version}</version>
+            <version>1.0-incubator-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

Added: incubator/tuscany/java/sca/extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/pom.xml?view=auto&rev=500608
==============================================================================
--- incubator/tuscany/java/sca/extensions/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/pom.xml Sat Jan 27 12:12:20 2007
@@ -0,0 +1,135 @@
+<?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>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.1-pre-spec-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.sca.extensions</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0-incubator-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Tuscany SCA Extensions</name>
+
+    <properties>
+        <extensionVersion>1.0-incubator-SNAPSHOT</extensionVersion>
+        <tuscanyKernelVersion>0.1-pre-spec-SNAPSHOT</tuscanyKernelVersion>
+        <scaImplVersion>0.1-pre-spec-SNAPSHOT</scaImplVersion>
+        <specVersion>0.95</specVersion>
+        <scaVersion>1.0-incubator-SNAPSHOT</scaVersion>
+        <sdoVersion>1.0-incubator-SNAPSHOT</sdoVersion>
+    </properties>
+
+    <!-- definition of repositories where the parent pom can be found -->
+    <repositories>
+        <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>apache.incubator</id>
+            <name>Apache Incubator Repository</name>
+            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <modules>
+        <module>axis2</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.osoa</groupId>
+                <artifactId>sca-api-r0.95</artifactId>
+               <version>${scaVersion}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>2.2</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymockclassextension</artifactId>
+                <version>2.2</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>test</artifactId>
+               <version>${tuscanyKernelVersion}</version>
+               <scope>test</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca.kernel</groupId>
+               <artifactId>tuscany-api</artifactId>
+               <version>${tuscanyKernelVersion}</version>
+               <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca.kernel</groupId>
+               <artifactId>tuscany-spi</artifactId>
+               <version>${tuscanyKernelVersion}</version>
+               <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+               <artifactId>webapp-api</artifactId>
+               <version>${tuscanyKernelVersion}</version>
+               <scope>runtime</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>

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

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

Propchange: incubator/tuscany/java/sca/extensions/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/tuscany/java/sca/services/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/pom.xml?view=diff&rev=500608&r1=500607&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/pom.xml (original)
+++ incubator/tuscany/java/sca/services/bindings/pom.xml Sat Jan 27 12:12:20 2007
@@ -37,7 +37,6 @@
          
         <module>sunjars</module>
         <module>binding.celtix</module>
-        <module>binding.axis2</module>
         <module>binding.jsonrpc</module>
         <module>binding.rmi</module>
         <module>binding.jms</module>

Modified: incubator/tuscany/java/sca/services/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/pom.xml?view=diff&rev=500608&r1=500607&r2=500608
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/services/databinding/pom.xml Sat Jan 27 12:12:20 2007
@@ -32,7 +32,6 @@
     <name>Tuscany SCA Data Bindings</name>
 
     <modules>
-        <module>databinding-axiom</module>
         <module>databinding-castor</module>
         <module>databinding-jaxb</module>
         <module>databinding-sdo</module>



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


Mime
View raw message