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 15:39:35 UTC
svn commit: r530016 - in
/incubator/tuscany/java/sca/itest/databindings/interop: ./
src/main/resources/generate/
src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding/
src/test/java/org/apache/tuscany/sca/itest/sdodatabinding/
Author: slaws
Date: Wed Apr 18 06:39:34 2007
New Revision: 530016
URL: http://svn.apache.org/viewvc?view=rev&rev=530016
Log:
Bring databinding interop itest up to speed with the new module structure
Added:
incubator/tuscany/java/sca/itest/databindings/interop/src/test/java/org/apache/tuscany/sca/itest/sdodatabinding/
Removed:
incubator/tuscany/java/sca/itest/databindings/interop/src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding/
Modified:
incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml
incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
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=530016&r1=530015&r2=530016
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/pom.xml Wed Apr 18 06:39:34 2007
@@ -58,6 +58,12 @@
<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-databinding-jaxb</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
@@ -93,7 +99,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscnay-itest-databingings-common</artifactId>
+ <artifactId>tuscany-itest-databindings-common</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
@@ -109,6 +115,24 @@
<version>${pom.version}</version>
<scope>compile</scope>
</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>
</dependencies>
<build>
@@ -135,7 +159,8 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -155,6 +180,7 @@
</execution>
</executions>
</plugin>
+-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -174,6 +200,7 @@
</arguments>
</configuration>
</plugin>
+<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
@@ -195,6 +222,7 @@
<verbose>true</verbose>
</configuration>
</plugin>
+-->
</plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm?view=diff&rev=530016&r1=530015&r2=530016
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm Wed Apr 18 06:39:34 2007
@@ -24,7 +24,7 @@
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
-import org.apache.tuscany.api.SCARuntime;
+import org.apache.tuscany.host.embedded.SCARuntime;
import ${template.getJavaPackage()}.GreeterService;
// Data types
@@ -74,7 +74,7 @@
*/
private void setUpClient(String ext) throws Exception {
CompositeContext ctx = CurrentCompositeContext.getContext();
- greeterClient = ctx.locateService(GreeterService.class, ext + "GreeterServiceClient");
+ greeterClient = ctx.locateService(GreeterService.class, "SDO" + ext + "GreeterServiceClient");
}
/**
@@ -88,13 +88,10 @@
/**
* Invokes the SDO Greet service using default bindings with SDO payload
*/
-// Not sure that transformations should work with
-// local connections because the interface type will
-// be incorrect when specified in the SCDL
-// public void testDefaultGreet() throws Exception {
-// setUpClient("Default");
-// greet();
-// }
+ public void testDefaultGreet() throws Exception {
+ setUpClient("Default");
+ greet();
+ }
/**
* A generic method which, regarless of which client is connected, sends out a
Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm?view=diff&rev=530016&r1=530015&r2=530016
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm Wed Apr 18 06:39:34 2007
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services"
- xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services"
+<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/jaxb"
+ xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -29,7 +29,7 @@
#foreach($file in $fileList)
xmlns:$file.getPrefix()="$file.getNamespace()"
#end
- targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services"
+ targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/jaxb"
elementFormDefault="qualified">
#foreach($file in $fileList)
Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm?view=diff&rev=530016&r1=530015&r2=530016
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm Wed Apr 18 06:39:34 2007
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services"
- xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services"
+<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/sdo"
+ xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/sdo"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -29,7 +29,7 @@
#foreach($file in $fileList)
xmlns:$file.getPrefix()="$file.getNamespace()"
#end
- targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services"
+ targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/sdo"
elementFormDefault="qualified">
#foreach($file in $fileList)
@@ -96,7 +96,7 @@
<wsdl:service name="GreeterService">
<wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
- <wsdlsoap:address location="http://localhost:8080/services/JAXBGreeterServiceWebServiceBinding" />
+ <wsdlsoap:address location="http://localhost:8080/services/SDOGreeterServiceWebServiceBinding" />
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml?view=diff&rev=530016&r1=530015&r2=530016
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml Wed Apr 18 06:39:34 2007
@@ -23,8 +23,8 @@
<Template>
<TemplateName>InteropDatabindingTestCase.java.vm</TemplateName>
- <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
- <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
+ <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
+ <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
</Template>
<Template>
<TemplateName>interopgreeter.composite.vm</TemplateName>
@@ -41,14 +41,14 @@
<InputFile>
<FileName>Person.xsd</FileName>
<FilePath>xsd</FilePath>
- <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>
- <Factory>ObjectFactory</Factory>
+ <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage>
+ <Factory>TypesFactory</Factory>
<Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>
<Prefix>p</Prefix>
<Type>
<TypeName>PersonType</TypeName>
<CreateTypeCode>
- ObjectFactory factory = new ObjectFactory();
+ TypesFactory factory = TypesFactory.INSTANCE;
param = factory.createPersonType();
param.setFirstName("George");
param.setLastName("Doors");
@@ -64,14 +64,14 @@
<InputFile>
<FileName>Interop.xsd</FileName>
<FilePath>xsd</FilePath>
- <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>
- <Factory>ObjectFactory</Factory>
+ <JavaPackage>org.apache.tuscany.interop</JavaPackage>
+ <Factory>InteropFactory</Factory>
<Namespace>http://www.apache.org/tuscany/interop</Namespace>
<Prefix>i</Prefix>
<Type>
<TypeName>SimpleTypeWithNameComplexType</TypeName>
<CreateTypeCode>
- ObjectFactory factory = new ObjectFactory();
+ InteropFactory factory = InteropFactory.INSTANCE;
param = factory.createSimpleTypeWithNameComplexType();
param.setSimpleTypeWithNameElement("SomeText");
</CreateTypeCode>
@@ -85,7 +85,7 @@
<Type>
<TypeName>ComplexTypeWithContentType</TypeName>
<CreateTypeCode>
- ObjectFactory factory = new ObjectFactory();
+ InteropFactory factory = InteropFactory.INSTANCE;
param = factory.createComplexTypeWithContentType();
param.setSimpleTypeWithName("SomeText");
</CreateTypeCode>
@@ -96,5 +96,5 @@
assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
</ResultComparison>
</Type>
- </InputFile>
+ </InputFile>
</tns:Generate>
Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm?view=diff&rev=530016&r1=530015&r2=530016
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm Wed Apr 18 06:39:34 2007
@@ -22,83 +22,57 @@
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
name="SDOGreeterService">
- <!-- SDO factory classes -->
-<!--
+ <!-- SDO factory classes -->
#foreach( $file in $fileList )
<dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
- #end
--->
- <!--
- manually inserted bcause the generator for interop
- is set to generate JAXB methods not SDO methods. Need
- to switch this round so the client is SDO based
- -->
- <dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.types.TypesFactory"/>
- <dbsdo:import.sdo factory="org.apache.tuscany.interop.InteropFactory"/>
-
+ #end
<!-- Default binding test -->
- <component name="DefaultGreeterServiceClient">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService">SDODefaultGreeterServiceClient</reference>
- </component>
-
<component name="SDODefaultGreeterServiceClient">
<implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService">JAXBGreeterService</reference>
- </component>
+ <reference name="greeterService" target="JAXBDefaultGreeterServiceClient"/>
+ </component>
+
+ <component name="JAXBDefaultGreeterServiceClient">
+ <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
+ <reference name="greeterService" target="SDODefaultGreeterServiceComponent"/>
+ </component>
- <component name="JAXBGreeterService">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceImpl" />
+ <component name="SDODefaultGreeterServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
</component>
<!-- WS binding test -->
- <component name="WSGreeterServiceClient">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService">SDOGreeterServiceWSRef</reference>
+ <component name="SDOWSGreeterServiceClient">
+ <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
</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/SDOGreeter.wsdl" />
- <binding.ws
- endpoint="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.endpoint(GreeterService/GreeterPort)"
- location="wsdl/SDOGreeter.wsdl" />
+ <reference name="JAXBWSGreeterServiceReference" promote="SDOWSGreeterServiceClient/greeterService">
+ <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/>
+ <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/>
</reference>
- <service name="SDOGreeterServiceWebServiceBinding">
- <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/SDOGreeter.wsdl" />
- <binding.ws
- endpoint="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.endpoint(GreeterService/GreeterPort)"
- location="wsdl/SDOGreeter.wsdl" />
- <reference>SDOWSGreeterServiceClient</reference>
+ <service name="JAXBWSGreeterService" promote="JAXBWSGreeterServiceClient">
+ <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/>
+ <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/>
</service>
- <component name="SDOWSGreeterServiceClient">
- <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService">JAXBGreeterServiceWSRef</reference>
+ <component name="JAXBWSGreeterServiceClient">
+ <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
</component>
- <reference name="JAXBGreeterServiceWSRef">
- <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/JAXBGreeter.wsdl" />
- <binding.ws
- endpoint="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.endpoint(GreeterService/GreeterPort)"
- location="wsdl/JAXBGreeter.wsdl" />
+ <reference name="SDOWSGreeterServiceReference" promote="JAXBWSGreeterServiceClient/greeterService">
+ <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/>
+ <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/>
</reference>
- <service name="JAXBGreeterServiceWebServiceBinding">
- <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/JAXBGreeter.wsdl" />
- <binding.ws
- endpoint="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.endpoint(GreeterService/GreeterPort)"
- location="wsdl/JAXBGreeter.wsdl" />
- <reference>JAXBWSGreeterService</reference>
+ <service name="SDOWSGreeterService" promote="SDOWSGreeterServiceComponent">
+ <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/>
+ <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/>
</service>
- <component name="JAXBWSGreeterService">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceImpl" />
+ <component name="SDOWSGreeterServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
</component>
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org