You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/11 13:43:48 UTC

svn commit: r813784 - in /tuscany/branches/sca-java-1.x/itest: ./ jaxws/ jaxws/src/ jaxws/src/main/ jaxws/src/main/java/ jaxws/src/main/java/com/ jaxws/src/main/java/com/tuscanyscatours/ jaxws/src/main/java/com/tuscanyscatours/payment/ jaxws/src/main/j...

Author: nash
Date: Fri Sep 11 11:43:45 2009
New Revision: 813784

URL: http://svn.apache.org/viewvc?rev=813784&view=rev
Log:
Add itest/jaxws for TUSCANY-3267

Added:
    tuscany/branches/sca-java-1.x/itest/jaxws/   (with props)
    tuscany/branches/sca-java-1.x/itest/jaxws/pom.xml
    tuscany/branches/sca-java-1.x/itest/jaxws/src/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl
    tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite
    tuscany/branches/sca-java-1.x/itest/jaxws/src/test/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/
    tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
Modified:
    tuscany/branches/sca-java-1.x/itest/pom.xml

Propchange: tuscany/branches/sca-java-1.x/itest/jaxws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 11 11:43:45 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Added: tuscany/branches/sca-java-1.x/itest/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jaxws/pom.xml?rev=813784&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jaxws/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/jaxws/pom.xml Fri Sep 11 11:43:45 2009
@@ -0,0 +1,125 @@
+<?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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jaxws</artifactId>
+    <name>Apache Tuscany SCA iTest JAXWS generated artifacts</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>    
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>test</scope>            
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+       
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <executions>
+                    <execution>
+                        <id>payment</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>com.tuscanyscatours.payment</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>Payment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java?rev=813784&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java (added)
+++ tuscany/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java Fri Sep 11 11:43:45 2009
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package com.tuscanyscatours.payment.impl;
+
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.payment.Payment;
+
+/**
+ * The payment implementation
+ */
+@Service(Payment.class)
+public class PaymentImpl implements Payment {
+
+    public String makePaymentMember(String customerId, float amount) {
+        return "Made payment of " + amount + " to customer " + customerId;
+    }
+}

Added: tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl?rev=813784&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl (added)
+++ tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl Fri Sep 11 11:43:45 2009
@@ -0,0 +1,83 @@
+<?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.    
+-->
+<wsdl:definitions name="Payment" 
+                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+                  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
+
+            <xsd:complexType name="MakePaymentMemberType">
+                <xsd:sequence>
+                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>                    
+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
+      
+            <xsd:complexType name="MakePaymentMemberResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
+            
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="MakePaymentMemberRequest">
+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="MakePaymentMemberResponse">
+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="Payment">
+        <wsdl:operation name="makePaymentMember">
+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="PaymentBinding" type="tns:Payment">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="makePaymentMember">
+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="PaymentService">
+        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
+            <soap:address location="http://localhost:8083/Payment" />
+        </wsdl:port>
+    </wsdl:service>
+    
+   <plnk:partnerLinkType name="PaymentLinkType">
+       <plnk:role name="forward" portType="tns:Payment"/>
+   </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite?rev=813784&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite (added)
+++ tuscany/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite Fri Sep 11 11:43:45 2009
@@ -0,0 +1,33 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           targetNamespace="http://tuscanyscatours.com/"
+           name="payment">
+           
+    <component name="Payment">
+        <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />
+        <service name="Payment">
+            <!-- use interface.wsdl to work around TUSCANY-3267 -->
+            <!--interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" /-->
+            <binding.ws uri="http://localhost:8081/Payment"/>
+        </service>
+    </component>
+    
+</composite>

Added: tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java?rev=813784&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java (added)
+++ tuscany/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java Fri Sep 11 11:43:45 2009
@@ -0,0 +1,55 @@
+/*
+ * 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.    
+ */
+
+package scatours.payment;
+
+import com.tuscanyscatours.payment.Payment;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class PaymentTestCase {
+    private static SCANode node;
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        node = SCANodeFactory.newInstance().createSCANode("payment.composite", 
+                new SCAContribution("payment", "./target/classes"));
+        node.start();
+    }
+    
+    @Test
+    public void testPayment() {
+        SCAClient client = (SCAClient) node;
+        Payment payment = client.getService(Payment.class, "Payment");
+        System.out.println(payment.makePaymentMember("c-0", 100.00f));
+    }
+    
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        if (node != null) {
+            node.stop();
+            node = null;
+        }
+    }
+}

Modified: tuscany/branches/sca-java-1.x/itest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/pom.xml?rev=813784&r1=813783&r2=813784&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/pom.xml Fri Sep 11 11:43:45 2009
@@ -102,6 +102,7 @@
                 <module>interop-soap-round2-client</module>
                 <module>interop-soap-service</module>
                 -->
+                <module>jaxws</module>
                 <module>jms</module>
                 <module>jms-args</module>
                 <module>jms-callbacks</module>