From 23d5587f8a4a4dfa5fb2f5d9497d04733cdfe8df Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 21 Dec 2009 11:58:17 +0000
Subject: Copy 1.x trunk to branches for start of 1.6 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@892786 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/WEB-INF/geronimo-web.xml       | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 sca-java-1.x/branches/sca-java-1.6/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml

(limited to 'sca-java-1.x/branches/sca-java-1.6/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml')

diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..48478ecd93
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/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.6-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+    </d:environment>
+</web-app>
-- 
cgit v1.2.3