From 0d7533759f027a0fafc5844210ddf4e35122c758 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 22 Jul 2010 09:11:51 +0000 Subject: Create branch for next release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966547 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/sample/HelloworldService.java | 25 +++++++++ .../main/java/sample/HelloworldServiceImpl.java | 27 +++++++++ .../src/main/java/sample/HelloworldServlet.java | 64 ++++++++++++++++++++++ .../src/main/webapp/WEB-INF/web.composite | 34 ++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 44 +++++++++++++++ .../helloworld-servlet/src/main/webapp/hello.html | 46 ++++++++++++++++ .../src/test/java/itest/HelloworldTestCase.java | 55 +++++++++++++++++++ 7 files changed, 295 insertions(+) create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html create mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java (limited to 'sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src') diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..2e43e09897 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/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/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..9e79276704 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/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/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java new file mode 100644 index 0000000000..bb72c50f6a --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/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("Apache Tuscany Helloworld Servlet Sample"); + out.write("

Apache Tuscany Helloworld Servlet Sample

"); + out.write("
Result: " + greeting); + out.write(""); + out.flush(); + out.close(); + } +} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..8976adde3c --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..a91b3fc96b --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,44 @@ + + + + + Apache Tuscany Helloworld Servlet Sample + + org.apache.tuscany.sca.host.webapp.TuscanyContextListener + + + HelloworldServlet + sample.HelloworldServlet + + + + HelloworldServlet + /HelloworldServlet + + + + hello.html + + + + diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html new file mode 100644 index 0000000000..c4484916aa --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html @@ -0,0 +1,46 @@ + + + + +Apache Tuscany Helloworld Servlet Sample + + + + +

Apache Tuscany Helloworld Servlet Sample

+ +
+ + + + + + + + +
Enter your name: + +
+ +
+
+ + + \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java new file mode 100644 index 0000000000..61d722da1f --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java @@ -0,0 +1,55 @@ +/* + * 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 itest; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.net.MalformedURLException; + +import org.junit.Test; + +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlButton; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +/** + */ +public class HelloworldTestCase { + + @Test + public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { + HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-servlet"); + + HtmlForm form = (HtmlForm) page.getForms().get(0); + + HtmlInput textField = form.getInputByName("name"); + textField.setValueAttribute("petra"); + + HtmlButton button = (HtmlButton) form.getButtonsByName("submit").get(0); + + HtmlPage pageResponse = (HtmlPage) button.click(); + + assertTrue(pageResponse.getWebResponse().getContentAsString().endsWith("Hello petra")); + } + +} -- cgit v1.2.3