turn into a axis2 war with no Tuscany involvement

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

5 files changed, 85 insertions, 46 deletions

diff --git a/sandbox/slaws/axis-jaxws-experiment/pom.xml b/sandbox/slaws/axis-jaxws-experiment/pom.xml
index 56b5297964..2744b0d99e 100644
--- a/sandbox/slaws/axis-jaxws-experiment/pom.xml
+++ b/sandbox/slaws/axis-jaxws-experiment/pom.xml
@@ -27,10 +27,18 @@
     </parent>
     <artifactId>sandbox-axis-jaxws-experiment</artifactId>
     <name>Apache Tuscany SCA Sandbox Axis JAXWS Experiment</name>
+    <packaging>war</packaging>
 
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -54,6 +62,13 @@
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
+        </dependency-->
+        
+        <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2-webapp</artifactId>
+          <version>1.5.1</version>
+          <type>war</type>
         </dependency>
 
         <dependency>
diff --git a/sandbox/slaws/axis-jaxws-experiment/src/main/java/calculator/CalculatorClient.java b/sandbox/slaws/axis-jaxws-experiment/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 53c793806e..0000000000
--- a/sandbox/slaws/axis-jaxws-experiment/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 calculator;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        Node node = NodeFactory.newInstance().createNode((String)null, new String[] {"target/classes"}).start();
-        
-        CalculatorService calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent");
-        
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        node.stop();
-    }
-
-}
diff --git a/sandbox/slaws/axis-jaxws-experiment/src/main/webapp/WEB-INF/services/add-service/META-INF/services.xml b/sandbox/slaws/axis-jaxws-experiment/src/main/webapp/WEB-INF/services/add-service/META-INF/services.xml
new file mode 100644
index 0000000000..8cb5bb4996
--- /dev/null
+++ b/sandbox/slaws/axis-jaxws-experiment/src/main/webapp/WEB-INF/services/add-service/META-INF/services.xml
@@ -0,0 +1,33 @@
+<!--
+    * 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.    
+-->
+<serviceGroup>
+  <service name="AddService" scope="application">
+
+    <description>Add Service</description>
+
+    <messageReceivers>
+      <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+          class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
+    </messageReceivers>
+    <parameter name="ServiceClass">calculator.AddServiceImpl</parameter>
+    <parameter name="useOriginalwsdl">true</parameter>
+  </service>
+
+</serviceGroup>
+
diff --git a/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService.wsdl b/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService.wsdl
index b07f05ad66..1c870c0f76 100644
--- a/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService.wsdl
+++ b/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService.wsdl
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    * 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.    
+-->
 <!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.1 in JDK 6. -->
 <definitions targetNamespace="http://calculator/" name="AddServiceImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://calculator/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
   <types>
@@ -32,7 +50,7 @@
   </binding>
   <service name="AddServiceImplService">
     <port name="AddServiceImplPort" binding="tns:AddServiceImplPortBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+      <soap:address location="http://localhost:8080/Test/Add"/>
     </port>
   </service>
 </definitions>
diff --git a/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService_schema1.xsd b/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService_schema1.xsd
index 735f19bff3..651693f103 100644
--- a/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService_schema1.xsd
+++ b/sandbox/slaws/axis-jaxws-experiment/src/wsgenout/AddServiceImplService_schema1.xsd
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    * 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.    
+-->
 <xs:schema version="1.0" targetNamespace="http://calculator/" xmlns:tns="http://calculator/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="add" type="tns:add"/>