Start with a known WSDL

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@920606 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 81 insertions, 7 deletions

diff --git a/sandbox/rfeng/binding-ws-jaxws/pom.xml b/sandbox/rfeng/binding-ws-jaxws/pom.xml
index b44407eb03..8b5d46be10 100644
--- a/sandbox/rfeng/binding-ws-jaxws/pom.xml
+++ b/sandbox/rfeng/binding-ws-jaxws/pom.xml
@@ -55,14 +55,14 @@
             <artifactId>tuscany-binding-ws</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
+            <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
@@ -93,6 +93,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
diff --git a/sandbox/rfeng/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java b/sandbox/rfeng/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
index a01252d1a8..2be6963e15 100644
--- a/sandbox/rfeng/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
+++ b/sandbox/rfeng/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
@@ -85,7 +85,7 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider, Prov
 
     public void start() {
         wsEndpoint = Endpoint.create(this);
-        wsEndpoint.publish(wsBinding.getURI());
+        wsEndpoint.publish("http://localhost:8085" + wsBinding.getURI());
     }
 
     public void stop() {
diff --git a/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/BindingWSJAXWSTestCase.java b/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/BindingWSJAXWSTestCase.java
new file mode 100644
index 0000000000..a9d74553dc
--- /dev/null
+++ b/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/BindingWSJAXWSTestCase.java
@@ -0,0 +1,61 @@
+/*
+ * 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 weather;
+
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class BindingWSJAXWSTestCase {
+    private static Node node;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        String location = ContributionLocationHelper.getContributionLocation(WeatherForecastImpl.class);
+        node = NodeFactory.getInstance().createNode("WeatherForecast.composite", new Contribution("c1", location));
+        node.start();
+    }
+
+    @Test
+    public void testJAXWS() throws Exception {
+        WeatherForecastClient.testJAXWS(node);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        if (node != null) {
+            node.stop();
+        }
+    }
+
+}
diff --git a/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java b/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
index 38dc930f10..66b9ddce98 100644
--- a/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
+++ b/sandbox/rfeng/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
@@ -21,7 +21,9 @@ package weather;
 import java.io.StringWriter;
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.PropertyException;
 
 import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.ContributionLocationHelper;
@@ -42,6 +44,12 @@ public class WeatherForecastClient {
         String location = ContributionLocationHelper.getContributionLocation(WeatherForecastImpl.class);
         Node node = NodeFactory.newInstance().createNode("WeatherForecast.composite", new Contribution("c1", location));
         node.start();
+        testJAXWS(node);
+
+        node.stop();
+    }
+
+    static void testJAXWS(Node node) throws JAXBException, PropertyException {
         WeatherForecastSoap weatherService = node.getService(WeatherForecastSoap.class, "WeatherForecastService");
 
         WeatherForecasts result = weatherService.getWeatherByZipCode("94555");
@@ -61,7 +69,5 @@ public class WeatherForecastClient {
 
         String xml = writer.toString();
         System.out.println(xml);
-
-        node.stop();
     }
 }
diff --git a/sandbox/rfeng/binding-ws-jaxws/src/test/resources/WeatherForecast.composite b/sandbox/rfeng/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
index 31f7b4553f..ff98e51c67 100644
--- a/sandbox/rfeng/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
+++ b/sandbox/rfeng/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
@@ -27,7 +27,7 @@
             <binding.ws wsdlElement="http://www.webservicex.net#wsdl.port(WeatherForecast/WeatherForecastSoap)" />

         </reference>

         <service name="WeatherForecastSoap">

-            <binding.ws/> 

+            <binding.ws wsdlElement="http://www.webservicex.net#wsdl.port(WeatherForecast/WeatherForecastSoap)" />

         </service>

     </component>