You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/04/14 20:46:47 UTC
svn commit: r528852 - in /incubator/tuscany/java/sca/itest/databindings: ./
common/ common/src/main/resources/generate/ interop/ jaxbgen/ sdogen/
sdogen/src/main/resources/generate/
sdogen/src/test/java/org/apache/tuscany/sca/itest/sdodatabinding/
Author: slaws
Date: Sat Apr 14 11:46:46 2007
New Revision: 528852
URL: http://svn.apache.org/viewvc?view=rev&rev=528852
Log:
changes to fit in with the new module structure - test not working yet
Added:
incubator/tuscany/java/sca/itest/databindings/sdogen/src/test/java/org/apache/tuscany/sca/itest/sdodatabinding/
Modified:
incubator/tuscany/java/sca/itest/databindings/common/pom.xml
incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/pom.xml.vm
incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml
incubator/tuscany/java/sca/itest/databindings/pom.xml
incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
Modified: incubator/tuscany/java/sca/itest/databindings/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/pom.xml?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/pom.xml Sat Apr 14 11:46:46 2007
@@ -19,15 +19,15 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>databindings</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-commonDatabinding</artifactId>
- <version>${testing.version}</version>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Common elements of Databindings Integration Tests</name>
@@ -57,20 +57,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm Sat Apr 14 11:46:46 2007
@@ -21,10 +21,10 @@
import junit.framework.TestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
import org.apache.tuscany.api.SCARuntime;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+
import ${template.getJavaPackage()}.GreeterService;
// Data types
@@ -73,8 +73,9 @@
* @param ext the protcol required
*/
private void setUpClient(String ext) throws Exception {
- CompositeContext ctx = CurrentCompositeContext.getContext();
- greeterClient = ctx.locateService(GreeterService.class, ext + "GreeterServiceClient");
+ ComponentContext context = SCARuntime.getComponentContext(ext + "GreeterServiceClient");
+ ServiceReference<GreeterService> service = context.createSelfReference(GreeterService.class);
+ greeterClient = service.getService();
}
/**
Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/pom.xml.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/pom.xml.vm?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/pom.xml.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/pom.xml.vm Sat Apr 14 11:46:46 2007
@@ -19,15 +19,15 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>databindings</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-sdoDatabinding</artifactId>
- <version>${testing.version}</version>
+ <artifactId>tuscany-itest-databindings-sdo</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDO Databinding Integration Test</name>
@@ -57,26 +57,32 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-jaxb</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
@@ -96,8 +102,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
Modified: incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/pom.xml?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/pom.xml Sat Apr 14 11:46:46 2007
@@ -19,15 +19,15 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>databindings</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-interopDatabinding</artifactId>
- <version>${testing.version}</version>
+ <artifactId>tuscany-itest-databindings-interop</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Interoperability Databindings Integration Test</name>
@@ -57,20 +57,20 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-jaxb</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
@@ -92,20 +92,20 @@
<version>2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscnay-itest-databingings-common</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-sdoDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-sdo</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-jaxbDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-jaxb</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
@@ -125,8 +125,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
Modified: incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml Sat Apr 14 11:46:46 2007
@@ -19,15 +19,15 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>databindings</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-jaxbDatabinding</artifactId>
- <version>${testing.version}</version>
+ <artifactId>tuscany-itest-databindings-jaxb</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JAXB Databinding Integration Test</name>
@@ -57,26 +57,26 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-jaxb</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
@@ -113,8 +113,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
Modified: incubator/tuscany/java/sca/itest/databindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/pom.xml?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/pom.xml Sat Apr 14 11:46:46 2007
@@ -19,17 +19,17 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>databindings</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings</artifactId>
<name>SCA Databindings Integration Tests</name>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml Sat Apr 14 11:46:46 2007
@@ -19,17 +19,17 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>databindings</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-sdoDatabinding</artifactId>
- <version>${testing.version}</version>
+ <artifactId>tuscany-itest-databindings-sdo</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>SDO Databindings Integration Tests</name>
+ <name>SDO Databinding Integration Test</name>
<repositories>
<repository>
@@ -57,26 +57,26 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-jaxb</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
@@ -96,8 +96,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>itest-commonDatabinding</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm?view=diff&rev=528852&r1=528851&r2=528852
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm Sat Apr 14 11:46:46 2007
@@ -29,18 +29,16 @@
#end
<!-- Services Exposed via different bindings -->
- <service name="SDOGreeterServiceDefaultBinding">
+ <service name="SDOGreeterServiceDefaultBinding" promote="SDOGreeterServiceComponent">
<interface.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterService" />
- <reference>SDOGreeterServiceComponent</reference>
</service>
- <service name="GreeterServiceWebServiceBinding">
+ <service name="GreeterServiceWebServiceBinding" promote="SDOGreeterServiceComponent">
<interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"
wsdli:wsdlLocation="http://apache.org/tuscany/sca/itest/databinding/services wsdl/Greeter.wsdl" />
<binding.ws
endpoint="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.endpoint(GreeterService/GreeterPort)"
location="wsdl/Greeter.wsdl" />
- <reference>SDOGreeterServiceComponent</reference>
</service>
<!-- Components used to implement the services -->
@@ -53,7 +51,7 @@
<component name="DefaultGreeterServiceClient">
<implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
<!--reference name="greeterService">SDOGreeterServiceDefaultRef</reference-->
- <reference name="greeterService">SDOGreeterServiceComponent</reference>
+ <reference name="greeterService" target="SDOGreeterServiceComponent"/>
</component>
<reference name="SDOGreeterServiceDefaultRef">
@@ -62,7 +60,7 @@
<component name="WSGreeterServiceClient">
<implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService">SDOGreeterServiceWSRef</reference>
+ <reference name="greeterService" target="SDOGreeterServiceWSRef"/>
</component>
<reference name="SDOGreeterServiceWSRef">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org