You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/07 02:25:50 UTC
svn commit: r515411 - in
/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings:
jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/
jaxb/src/main/resources/wsdl/ sdo/
sdo/src/main/java/org/apache/tuscany/sca/itest...
Author: rfeng
Date: Tue Mar 6 17:25:49 2007
New Revision: 515411
URL: http://svn.apache.org/viewvc?view=rev&rev=515411
Log:
[sca-integration-branch] Fix the test case so that testGreet works again. It was missing generated classes for the WSDL.
Modified:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterService.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterServiceClient.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/resources/wsdl/Greeter.wsdl
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterService.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClient.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/greetersdo.composite
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/wsdl/Greeter.wsdl
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterService.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterService.java Tue Mar 6 17:25:49 2007
@@ -19,10 +19,8 @@
package org.apache.tuscany.sca.itest.jaxbdatabinding;
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
import org.apache.tuscany.sca.itest.jaxbdatabinding.generated.PersonType;
+import org.osoa.sca.annotations.Remotable;
/**
*
@@ -30,7 +28,7 @@
@Remotable
public interface GreeterService {
- @DataType(name = "javax.xml.bind.JAXBElement")
+ // @DataType(name = "javax.xml.bind.JAXBElement")
PersonType greet(PersonType who);
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterServiceClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterServiceClient.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterServiceClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding/GreeterServiceClient.java Tue Mar 6 17:25:49 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.itest.jaxbdatabinding;
-import org.apache.tuscany.api.annotation.DataType;
import org.apache.tuscany.sca.itest.jaxbdatabinding.generated.PersonType;
import org.osoa.sca.annotations.AllowsPassByReference;
@@ -29,7 +28,7 @@
@AllowsPassByReference
public interface GreeterServiceClient {
- @DataType(name = "javax.xml.bind.JAXBElement")
+ // @DataType(name = "javax.xml.bind.JAXBElement")
PersonType greet(PersonType who);
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/resources/wsdl/Greeter.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/resources/wsdl/Greeter.wsdl?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/resources/wsdl/Greeter.wsdl (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/main/resources/wsdl/Greeter.wsdl Tue Mar 6 17:25:49 2007
@@ -38,6 +38,14 @@
</complexType>
</element>
+ <element name="greetResponse">
+ <complexType>
+ <sequence>
+ <element name="person" type="dataTypes:PersonType" />
+ </sequence>
+ </complexType>
+ </element>
+
</xsd:schema>
</wsdl:types>
@@ -47,7 +55,7 @@
</wsdl:message>
<wsdl:message name="response">
- <wsdl:part element="tns:greet" name="parameters" />
+ <wsdl:part element="tns:greetResponse" name="parameters" />
</wsdl:message>
<wsdl:portType name="GreeterPortType">
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/pom.xml?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/pom.xml Tue Mar 6 17:25:49 2007
@@ -16,21 +16,21 @@
* 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.testing</groupId>
<artifactId>databindings</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<artifactId>iTest-sdoDatabinding</artifactId>
<version>${testing.version}</version>
<packaging>jar</packaging>
<name>Test Suite for SDO Databindings</name>
-
+
<repositories>
<repository>
<snapshots>
@@ -42,7 +42,7 @@
<layout>legacy</layout>
</repository>
</repositories>
-
+
<pluginRepositories>
<pluginRepository>
<snapshots>
@@ -54,7 +54,7 @@
<layout>legacy</layout>
</pluginRepository>
</pluginRepositories>
-
+
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
@@ -79,20 +79,20 @@
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
<scope>compile</scope>
- </dependency -->
+ </dependency -->
<!-- dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1</version>
<scope>runtime</scope>
- </dependency -->
+ </dependency -->
<!-- dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.1</version>
- </dependency -->
+ </dependency -->
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -123,10 +123,18 @@
<id>generate-sdo</id>
<phase>generate-sources</phase>
<configuration>
- <schemaDir>${basedir}/src/main/resources/xsd</schemaDir>
- <javaPackage>org.apache.tuscany.sca.itest.sdodatabinding.generated</javaPackage>
+ <schemaFiles>
+ <configuration>
+ <fileName>${basedir}/src/main/resources/wsdl/Greeter.wsdl</fileName>
+ <javaPackage>org.apache.tuscany.sca.itest.databinding.services</javaPackage>
+ </configuration>
+ <configuration>
+ <fileName>${basedir}/src/main/resources/xsd/Person.xsd</fileName>
+ <javaPackage>org.apache.tuscany.sca.itest.databinding.types</javaPackage>
+ </configuration>
+ </schemaFiles>
<noNotification>true</noNotification>
- <noContainer>true</noContainer>
+ <noContainment>true</noContainment>
<noUnsettable>true</noUnsettable>
</configuration>
<goals>
@@ -135,6 +143,6 @@
</execution>
</executions>
</plugin>
- </plugins>
-</build>
+ </plugins>
+ </build>
</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterService.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterService.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterService.java Tue Mar 6 17:25:49 2007
@@ -19,18 +19,16 @@
package org.apache.tuscany.sca.itest.sdodatabinding;
-import org.apache.tuscany.api.annotation.DataType;
+import org.apache.tuscany.sca.itest.databinding.types.PersonType;
import org.osoa.sca.annotations.Remotable;
-import org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType;
-
/**
*
*/
@Remotable
public interface GreeterService {
- @DataType(name = "commonj.sdo.DataObject")
+ // @DataType(name = "commonj.sdo.DataObject")
PersonType greet(PersonType who);
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClient.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClient.java Tue Mar 6 17:25:49 2007
@@ -19,16 +19,16 @@
package org.apache.tuscany.sca.itest.sdodatabinding;
-import org.apache.tuscany.api.annotation.DataType;
-import org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType;
+import org.apache.tuscany.sca.itest.databinding.types.PersonType;
+import org.osoa.sca.annotations.AllowsPassByReference;
/**
*
*/
-
+@AllowsPassByReference
public interface GreeterServiceClient {
- @DataType(name = "commonj.sdo.DataObject")
+ // @DataType(name = "commonj.sdo.DataObject")
PersonType greet(PersonType who);
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java Tue Mar 6 17:25:49 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.itest.sdodatabinding;
-import org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType;
+import org.apache.tuscany.sca.itest.databinding.types.PersonType;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java Tue Mar 6 17:25:49 2007
@@ -19,10 +19,9 @@
package org.apache.tuscany.sca.itest.sdodatabinding;
+import org.apache.tuscany.sca.itest.databinding.types.PersonType;
import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType;
-
/**
*
*/
@@ -32,7 +31,7 @@
/*
* (non-Javadoc)
*
- * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet(javax.xml.bind.JAXBElement)
+ * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet(org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType)
*/
public PersonType greet(PersonType who) {
System.out.println(who.toString());
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/greetersdo.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/greetersdo.composite?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/greetersdo.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/greetersdo.composite Tue Mar 6 17:25:49 2007
@@ -17,10 +17,15 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
name="SDOGreeterService">
- <dbsdo:import.sdo location="wsdl/Greeter.wsdl" xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" />
-
+
+ <!-- SDO factory classes -->
+ <dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.services.ServicesFactory"/>
+ <dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.types.TypesFactory"/>
+
<!-- Services Exposed via different bindings -->
<service name="SDOGreeterServiceDefaultBinding">
<interface.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterService" />
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/wsdl/Greeter.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/wsdl/Greeter.wsdl?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/wsdl/Greeter.wsdl (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/resources/wsdl/Greeter.wsdl Tue Mar 6 17:25:49 2007
@@ -22,17 +22,18 @@
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Greeter">
<wsdl:types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:dataTypes="http://apache.org/tuscany/sca/itest/databinding/types"
+ <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:p="http://apache.org/tuscany/sca/itest/databinding/types"
targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services" elementFormDefault="qualified">
<xsd:import namespace="http://apache.org/tuscany/sca/itest/databinding/types" schemaLocation="../xsd/Person.xsd" />
- <xsd:element name="Person" type="dataTypes:PersonType" />
+ <!--
+ <xsd:element name="Person" type="p:PersonType" />
+ -->
<element name="greet">
<complexType>
<sequence>
- <element name="parm" type="tns:Person" />
+ <element name="parm" type="p:PersonType" />
</sequence>
</complexType>
</element>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java?view=diff&rev=515411&r1=515410&r2=515411
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java Tue Mar 6 17:25:49 2007
@@ -19,9 +19,9 @@
package org.apache.tuscany.sca.itest;
+import org.apache.tuscany.sca.itest.databinding.types.PersonType;
+import org.apache.tuscany.sca.itest.databinding.types.TypesFactory;
import org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClient;
-import org.apache.tuscany.sca.itest.sdodatabinding.generated.GeneratedFactory;
-import org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType;
import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
@@ -72,7 +72,7 @@
}
public void greet() {
- GeneratedFactory factory = GeneratedFactory.INSTANCE;
+ TypesFactory factory = TypesFactory.INSTANCE;
PersonType person = factory.createPersonType();
person.setFirstName("George");
person.setLastName("Doors");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org