Return-Path: 
 <commits-return-19152-apmail-tuscany-commits-archive=tuscany.apache.org@tuscany.apache.org>
Delivered-To: apmail-tuscany-commits-archive@www.apache.org
Received: (qmail 44044 invoked from network); 20 Nov 2008 14:40:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Nov 2008 14:40:56 -0000
Received: (qmail 31513 invoked by uid 500); 20 Nov 2008 14:41:05 -0000
Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org
Received: (qmail 31499 invoked by uid 500); 20 Nov 2008 14:41:05 -0000
Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tuscany.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tuscany.apache.org>
List-Post: <mailto:commits@tuscany.apache.org>
List-Id: <commits.tuscany.apache.org>
Reply-To: dev@tuscany.apache.org
Delivered-To: mailing list commits@tuscany.apache.org
Received: (qmail 31490 invoked by uid 99); 20 Nov 2008 14:41:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2008 06:41:05 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2008 14:39:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7ED9823888EB; Thu, 20 Nov 2008 06:40:26 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r719241 - in /tuscany/java/sca/samples/calculator-webapp:
 pom.xml src/main/java/calculator/CalculatorClient.java
 src/main/resources/Calculator.composite src/main/webapp/META-INF/
 src/main/webapp/WEB-INF/web.composite
Date: Thu, 20 Nov 2008 14:40:26 -0000
To: commits@tuscany.apache.org
From: antelder@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081120144026.7ED9823888EB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: antelder
Date: Thu Nov 20 06:40:25 2008
New Revision: 719241

URL: http://svn.apache.org/viewvc?rev=719241&view=rev
Log:
Start calculator-webapp bring up

Added:
    tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
Removed:
    tuscany/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
    tuscany/java/sca/samples/calculator-webapp/src/main/resources/Calculator.composite
    tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/
Modified:
    tuscany/java/sca/samples/calculator-webapp/pom.xml

Modified: tuscany/java/sca/samples/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-webapp/pom.xml?rev=719241&r1=719240&r2=719241&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-webapp/pom.xml (original)
+++ tuscany/java/sca/samples/calculator-webapp/pom.xml Thu Nov 20 06:40:25 2008
@@ -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>

Added: tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite?rev=719241&view=auto
==============================================================================
--- tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite (added)
+++ tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite Thu Nov 20 06:40:25 2008
@@ -0,0 +1,49 @@
+<?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://sample"
+           xmlns:sample="http://sample"
+           name="Calculator">
+
+    <component name="CalculatorServiceComponent">
+		<implementation.java class="calculator.CalculatorServiceImpl"/>
+        <reference name="addService" target="AddServiceComponent"></reference>
+        <reference name="subtractService" target="SubtractServiceComponent"></reference>
+        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
+        <reference name="divideService" target="DivideServiceComponent"></reference>
+    </component>
+
+    <component name="AddServiceComponent">
+        <implementation.java class="calculator.AddServiceImpl"/>
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl"/>
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl"/>
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl"/>
+    </component>
+
+</composite>