Create 2.0-M4 release branch

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

6 files changed, 240 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
new file mode 100644
index 0000000000..2e43e09897
--- /dev/null
+++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+package sample;
+
+public interface HelloworldService {
+
+    String sayHello(String name);
+
+}
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
new file mode 100644
index 0000000000..9e79276704
--- /dev/null
+++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+package sample;
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
new file mode 100644
index 0000000000..bb72c50f6a
--- /dev/null
+++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package sample;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Reference;
+
+/**
+ */
+public class HelloworldServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    @Reference
+    protected HelloworldService service;
+
+    @Override
+    public void init(ServletConfig servletConfig) throws ServletException {
+        if (service == null) {
+            System.out.println("HelloworldServlet reference injection failed, using ComponentContext");
+            ComponentContext cc = (ComponentContext)servletConfig.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
+            service = cc.getService(HelloworldService.class, "service");
+        }
+    }
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+    	String name = request.getParameter("name");
+    	String greeting = service.sayHello(name);
+
+        Writer out = response.getWriter();
+        out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample</title></head><body>");
+        out.write("<h2>Apache Tuscany Helloworld Servlet Sample</h2>");
+        out.write("<br><strong>Result: </strong>" + greeting);
+        out.write("</body></html>");
+        out.flush();
+        out.close();
+    }
+}
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..875d6aae9d
--- /dev/null
+++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
@@ -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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+           targetNamespace="http://samples"
+           name="Helloworld">
+
+    <component name="foo">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent"/>
+    </component>
+
+    <component name="HelloworldComponent">
+        <implementation.java class="sample.HelloworldServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..a91b3fc96b
--- /dev/null
+++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,44 @@
+<?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>
+
+	<listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener>
+
+    <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>
+
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
new file mode 100644
index 0000000000..c4484916aa
--- /dev/null
+++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
@@ -0,0 +1,46 @@
+<!--
+ * 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.
+-->
+<html>
+
+<head>
+<title>Apache Tuscany Helloworld Servlet Sample</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Servlet Sample</h2>
+
+<form action="HelloworldServlet" method="post">
+    <table>
+        <tr>
+            <td>Enter your name:</td>
+            <td>
+                <input type="text" name="name" width="10">
+            </td>
+        </tr>
+        <tr>
+            <td align="left" colspan="2">
+                <button name="submit" type="submit">Say hello</button>
+            </td>
+        </tr>
+    </table>
+</form>
+
+</body>
+</html>
\ No newline at end of file