From d5f1d093fe6fa491cdec392dca7137639e98d149 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 15 Sep 2008 00:26:00 +0000
Subject: Pulled a recent revision of trunk into the sca-android branch, to
 apply the android patches from JIRA TUSCANY-2440 to it.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/WEB-INF/geronimo-web.xml       | 34 ++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml                | 41 ++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
 create mode 100644 branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml

(limited to 'branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF')

diff --git a/branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..5da8c962a0
--- /dev/null
+++ b/branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,34 @@
+<?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">
+
+    <d:environment>
+        <d:moduleId>
+            <d:groupId>org.apache.tuscany.sca</d:groupId>
+            <d:artifactId>sample-calculator-ws-webapp</d:artifactId>
+            <d:version>1.4-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+        <!-- TUSCANY-1986 -->
+        <d:inverse-classloading />
+    </d:environment>
+</web-app>
diff --git a/branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..d3a62d39f4
--- /dev/null
+++ b/branches/sca-android/samples/calculator-ws-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>
-- 
cgit v1.2.3