From bee80d90df6104edff19cbb6a318fac3d64296aa Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 16 May 2009 08:53:06 +0000
Subject: Create 1.5 release branch from current 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775437 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/META-INF/sca-contribution.xml  | 23 +++++++++++
 .../src/main/webapp/WEB-INF/geronimo-web.xml       | 32 +++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml                | 41 +++++++++++++++++++
 .../calculator-webapp/src/main/webapp/calc.jsp     | 47 ++++++++++++++++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
 create mode 100644 branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
 create mode 100644 branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp

(limited to 'branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp')

diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8b60ae590c
--- /dev/null
+++ b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Calculator"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..0373937df2
--- /dev/null
+++ b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,32 @@
+<?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.    
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2"
+	xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2">
+
+    <d:environment>
+        <d:moduleId>
+            <d:groupId>org.apache.tuscany.sca</d:groupId>
+            <d:artifactId>sample-calculator-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+    </d:environment>
+</web-app>
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..b5a828d55b
--- /dev/null
+++ b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  * 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.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+  <display-name>Apache Tuscany Calculator Web Service Sample</display-name>
+
+  <filter>
+    <filter-name>tuscany</filter-name> 
+    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
+  </filter>
+
+  <filter-mapping>
+    <filter-name>tuscany</filter-name> 
+    <url-pattern>/*</url-pattern> 
+  </filter-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>calc.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp
new file mode 100644
index 0000000000..4bc5c984dd
--- /dev/null
+++ b/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp
@@ -0,0 +1,47 @@
+<%--
+ * 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.
+--%>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
+
+<sca:reference name="CalculatorServiceComponent" type="calculator.CalculatorService" />
+
+<html>
+<head><title>Calculator sample</title></head>
+
+<body>
+<table>
+    <tr>
+        <th>Expression</th><th>Result</th>
+    </tr>
+    <tr>
+        <td>2 + 3</td><td><%= CalculatorServiceComponent.add(2, 3) %></td>
+    </tr>
+    <tr>
+        <td>3 - 2</td><td><%= CalculatorServiceComponent.subtract(3, 2) %></td>
+    </tr>
+    <tr>
+        <td>3 * 2</td><td><%= CalculatorServiceComponent.multiply(3, 2) %></td>
+    </tr>
+    <tr>
+        <td>3 / 2</td><td><%= CalculatorServiceComponent.divide(3, 2) %></td>
+    </tr>    
+</table>
+</body>
+</html>
-- 
cgit v1.2.3