From 56f0d297c6eba38d5187431ed9319a97ff5d6094 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 4 Oct 2010 14:44:27 +0000 Subject: Rename 2.0-M5.1 release tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1004265 13f79535-47bb-0310-9956-ffa450edef68 --- .../samples/webapps/helloworld-servlet/README | 7 -- .../samples/webapps/helloworld-servlet/pom.xml | 105 --------------------- .../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 ----------- 9 files changed, 407 deletions(-) delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/README delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html delete mode 100644 sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java (limited to 'sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet') diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/README b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/README +++ /dev/null @@ -1,7 +0,0 @@ -The README in the /samples directory provides -general instructions about building and running samples. (where -distribution-unpack-dir is the directory in which you unpacked the tuscany -binary distribution archive). Take a look there first (noting at you read it that this sample -is not a new style sample). - -TODO - finish \ No newline at end of file diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml deleted file mode 100644 index b59d4861b8..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-M5.1 - ../../pom.xml - - - sample-helloworld-servlet-webapp - war - Apache Tuscany SCA Sample Helloworld Servlet - - - - - org.apache.tuscany.sca.shades - tuscany-base-nodep - 2.0-M5.1 - - - - javax.servlet - servlet-api - 2.5 - provided - - - - junit - junit - 4.8.1 - test - - - - net.sourceforge.htmlunit - htmlunit - 2.6 - test - - - - - - helloworld-servlet - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-servlet - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 2e43e09897..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 9e79276704..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java deleted file mode 100644 index bb72c50f6a..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index a91b3fc96b..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 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/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html deleted file mode 100644 index c4484916aa..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - -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/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 61d722da1f..0000000000 --- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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