Start calculator-webapp bring up

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

4 files changed, 0 insertions, 94 deletions

diff --git a/java/sca/samples/calculator-webapp/pom.xml b/java/sca/samples/calculator-webapp/pom.xml
index add604d80e..d2152897dc 100644
--- a/java/sca/samples/calculator-webapp/pom.xml
+++ b/java/sca/samples/calculator-webapp/pom.xml
@@ -44,29 +44,6 @@
         </dependency>

 

         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->

-        <dependency>

-            <groupId>stax</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <!-- marking dependency as provided to exclude from war file -->

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.3</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

             <groupId>junit</groupId>

             <artifactId>junit</artifactId>

             <version>4.5</version>

diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,47 +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.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- * 

- * (not really necessary as this sample runs in a webapp)

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-

-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");

-        CalculatorService calculatorService = 

-            scaDomain.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));

-        

-        scaDomain.close();

-

-    }

-

-}

diff --git a/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca/samples/calculator-webapp/src/main/resources/Calculator.composite b/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
index 50c23af0b2..50c23af0b2 100644
--- a/java/sca/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite