Branch for 1.5.1

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

2 files changed, 77 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..836d8c5070
--- /dev/null
+++ b/branches/sca-java-1.5.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?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-chat-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>		
+
+    </d:environment>
+</web-app>
diff --git a/branches/sca-java-1.5.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..97d91fec56
--- /dev/null
+++ b/branches/sca-java-1.5.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<!--

+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.

+

+  Licensed 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 AJAX/DWR Chat 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>

+        <welcome-file>chat.html</welcome-file>

+    </welcome-file-list>

+

+</web-app>