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/18 12:24:57 UTC
svn commit: r529952 - in /incubator/tuscany/java/sca/itest/databindings: ./
common/ common/src/main/resources/generate/ interop/ jaxbgen/ sdogen/
sdogen/src/main/resources/generate/
Author: slaws
Date: Wed Apr 18 03:24:45 2007
New Revision: 529952
URL: http://svn.apache.org/viewvc?view=rev&rev=529952
Log:
Fix module names and dependencies in poms
Take account of other renaming that has gone on in the modules, e.g. SCARuntime package
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=529952&r1=529951&r2=529952
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/pom.xml Wed Apr 18 03:24:45 2007
@@ -29,7 +29,7 @@
<artifactId>tuscany-itest-databindings-common</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Common elements of Databindings Integration Tests</name>
+ <name>Apache Tuscany Common elements of Databindings Integration Tests</name>
<repositories>
<repository>
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=529952&r1=529951&r2=529952
==============================================================================
--- 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 Wed Apr 18 03:24:45 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCARuntime;
+import org.apache.tuscany.host.embedded.SCARuntime;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
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=529952&r1=529951&r2=529952
==============================================================================
--- 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 Wed Apr 18 03:24:45 2007
@@ -29,7 +29,7 @@
<artifactId>tuscany-itest-databindings-sdo</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>SDO Databinding Integration Test</name>
+ <name>Apache Tuscany SDO Databinding Integration Test</name>
<repositories>
<repository>
@@ -58,6 +58,18 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-databinding</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-jaxb</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
@@ -80,6 +92,18 @@
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java-runtime</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest-databindings-common</artifactId>
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=529952&r1=529951&r2=529952
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/pom.xml Wed Apr 18 03:24:45 2007
@@ -29,7 +29,7 @@
<artifactId>tuscany-itest-databindings-interop</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Interoperability Databindings Integration Test</name>
+ <name>Apache Tuscany Interoperability Databindings Integration Test</name>
<repositories>
<repository>
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=529952&r1=529951&r2=529952
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml Wed Apr 18 03:24:45 2007
@@ -29,7 +29,7 @@
<artifactId>tuscany-itest-databindings-jaxb</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JAXB Databinding Integration Test</name>
+ <name>Apache Tuscany JAXB Databinding Integration Test</name>
<repositories>
<repository>
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=529952&r1=529951&r2=529952
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/pom.xml Wed Apr 18 03:24:45 2007
@@ -28,7 +28,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest-databindings</artifactId>
- <name>SCA Databindings Integration Tests</name>
+ <name>Apache Tuscany SCA Databindings Integration Tests</name>
<version>1.0-incubating-SNAPSHOT</version>
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=529952&r1=529951&r2=529952
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml Wed Apr 18 03:24:45 2007
@@ -29,7 +29,7 @@
<artifactId>tuscany-itest-databindings-sdo</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>SDO Databinding Integration Test</name>
+ <name>Apache Tuscany SDO Databinding Integration Test</name>
<repositories>
<repository>
@@ -58,6 +58,18 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-databinding</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-jaxb</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
@@ -76,6 +88,24 @@
</dependency>
<dependency>
<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-implementation-java-runtime</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java-runtime</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>
@@ -148,7 +178,7 @@
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubator-SNAPSHOT</version>
<executions>
<execution>
<id>generate-sdo</id>
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=529952&r1=529951&r2=529952
==============================================================================
--- 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 Wed Apr 18 03:24:45 2007
@@ -22,52 +22,36 @@
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
name="SDOGreeterService">
+ <!-- SDO factory classes -->
<dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.services.ServicesFactory"/>
- <!-- SDO factory classes -->
#foreach( $file in $fileList )
- <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
+ <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
#end
- <!-- Services Exposed via different bindings -->
- <service name="SDOGreeterServiceDefaultBinding" promote="SDOGreeterServiceComponent">
- <interface.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterService" />
- </service>
-
- <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" />
- </service>
-
- <!-- Components used to implement the services -->
- <component name="SDOGreeterServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
- </component>
-
-
<!-- Clients to test the services -->
<component name="DefaultGreeterServiceClient">
<implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
- <!--reference name="greeterService">SDOGreeterServiceDefaultRef</reference-->
<reference name="greeterService" target="SDOGreeterServiceComponent"/>
</component>
- <reference name="SDOGreeterServiceDefaultRef">
- <interface.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterService" />
- </reference>
-
<component name="WSGreeterServiceClient">
<implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService" target="SDOGreeterServiceWSRef"/>
+ <reference name="greeterService" target="SDOGreeterServiceWSReference"/>
+ </component>
+
+ <reference name="SDOGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">
+ <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
+ <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
+ </reference>
+
+ <!-- The greeter service -->
+ <service name="SDOGreeterService" promote="SDOGreeterServiceComponent">
+ <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
+ <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
+ </service>
+
+ <component name="SDOGreeterServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
</component>
- <reference name="SDOGreeterServiceWSRef">
- <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>
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org