Change to work with the embedded webapp runtime and new implementation.web, and change the service name to make the scdl more obvious

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

1 files changed, 49 insertions, 39 deletions

diff --git a/java/sca/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/java/sca/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index 0d72802863..28cfdd3f6c 100644
--- a/java/sca/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
@@ -1,42 +1,52 @@
-<?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 version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>
-

-    <servlet>
-        <servlet-name>HelloworldServlet</servlet-name>
-        <servlet-class>sample.HelloworldServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>HelloworldServlet</servlet-name>
-        <url-pattern>/HelloworldServlet</url-pattern>
-    </servlet-mapping>
-
+<?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 version="2.4"

+         xmlns="http://java.sun.com/xml/ns/j2ee"

+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

+

+    <display-name>Apache Tuscany Helloworld Servlet 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>

+

+    <servlet>

+        <servlet-name>HelloworldServlet</servlet-name>

+        <servlet-class>sample.HelloworldServlet</servlet-class>

+    </servlet>

+

+    <servlet-mapping>

+        <servlet-name>HelloworldServlet</servlet-name>

+        <url-pattern>/HelloworldServlet</url-pattern>

+    </servlet-mapping>

+

   <welcome-file-list id="WelcomeFileList">

     <welcome-file>hello.html</welcome-file>

   </welcome-file-list>

-
-</web-app>
+

+</web-app>