From e1070dcd880728a83b02d71c76e972fccf6e4996 Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Sat, 25 Sep 2010 16:50:33 +0000 Subject: TUSCANY-3677 getting-started clearup git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1001271 13f79535-47bb-0310-9956-ffa450edef68 --- .../implementation-webapp/helloworld-jaxrs/README | 7 + .../implementation-webapp/helloworld-jaxrs/pom.xml | 116 +++++++++++++ .../src/main/java/sample/HelloWorldResource.java | 68 ++++++++ .../src/main/java/sample/HelloworldService.java | 25 +++ .../main/java/sample/HelloworldServiceImpl.java | 28 +++ .../src/main/webapp/WEB-INF/application | 14 ++ .../src/main/webapp/WEB-INF/web.composite | 34 ++++ .../src/main/webapp/WEB-INF/web.xml | 49 ++++++ .../src/test/java/itest/HelloworldTestCase.java | 43 +++++ .../implementation-webapp/helloworld-jms/README | 131 ++++++++++++++ .../implementation-webapp/helloworld-jms/pom.xml | 96 +++++++++++ .../src/main/java/sample/HelloWorldClient.java | 37 ++++ .../src/main/java/sample/HelloWorldService.java | 29 ++++ .../main/java/sample/HelloWorldServiceImpl.java | 31 ++++ .../src/main/webapp/META-INF/context.xml | 34 ++++ .../src/main/webapp/WEB-INF/jetty-env.xml | 48 ++++++ .../src/main/webapp/WEB-INF/web.composite | 44 +++++ .../helloworld-jms/src/main/webapp/WEB-INF/web.xml | 66 +++++++ .../helloworld-jms/src/main/webapp/hello.jsp | 41 +++++ .../helloworld-js-client/README | 7 + .../helloworld-js-client/pom.xml | 104 +++++++++++ .../src/main/java/sample/HelloworldService.java | 25 +++ .../main/java/sample/HelloworldServiceImpl.java | 28 +++ .../src/main/webapp/WEB-INF/web.composite | 36 ++++ .../src/main/webapp/WEB-INF/web.xml | 41 +++++ .../src/main/webapp/hello.html | 51 ++++++ .../src/test/java/itest/HelloworldTestCase.java | 77 +++++++++ .../implementation-webapp/helloworld-jsf/pom.xml | 99 +++++++++++ .../src/main/java/sample/HelloWorldController.java | 56 ++++++ .../src/main/java/sample/HelloworldService.java | 25 +++ .../main/java/sample/HelloworldServiceImpl.java | 27 +++ .../src/main/webapp/WEB-INF/faces-config.xml | 51 ++++++ .../src/main/webapp/WEB-INF/web.composite | 34 ++++ .../helloworld-jsf/src/main/webapp/WEB-INF/web.xml | 191 +++++++++++++++++++++ .../helloworld-jsf/src/main/webapp/helloWorld.jsp | 40 +++++ .../helloworld-jsf/src/main/webapp/index.jsp | 23 +++ .../helloworld-jsf/src/main/webapp/page2.jsp | 38 ++++ .../implementation-webapp/helloworld-jsp/README | 7 + .../implementation-webapp/helloworld-jsp/pom.xml | 98 +++++++++++ .../src/main/java/sample/HelloworldService.java | 25 +++ .../main/java/sample/HelloworldServiceImpl.java | 28 +++ .../src/main/webapp/WEB-INF/web.composite | 34 ++++ .../helloworld-jsp/src/main/webapp/WEB-INF/web.xml | 41 +++++ .../helloworld-jsp/src/main/webapp/hello.jsp | 37 ++++ .../src/test/java/itest/HelloworldTestCase.java | 53 ++++++ .../helloworld-servlet/README | 7 + .../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 ++++++ .../helloworld-stripes/pom.xml | 112 ++++++++++++ .../main/java/mystripes/action/BaseActionBean.java | 33 ++++ .../main/java/mystripes/action/HomeActionBean.java | 45 +++++ .../src/main/java/sample/HelloworldService.java | 25 +++ .../main/java/sample/HelloworldServiceImpl.java | 28 +++ .../src/main/resources/StripesResources.properties | 73 ++++++++ .../src/main/resources/log4j.properties | 48 ++++++ .../src/main/webapp/WEB-INF/jsp/home.jsp | 26 +++ .../src/main/webapp/WEB-INF/jsp/layout.jsp | 39 +++++ .../src/main/webapp/WEB-INF/jsp/taglibs.jsp | 29 ++++ .../src/main/webapp/WEB-INF/web.composite | 34 ++++ .../src/main/webapp/WEB-INF/web.xml | 61 +++++++ .../helloworld-stripes/src/main/webapp/index.html | 24 +++ .../helloworld-stripes/src/test/java/README | 7 + .../src/test/java/itest/HelloworldTestCase.java | 53 ++++++ .../getting-started/implementation-webapp/pom.xml | 52 ++++++ .../webapps/helloworld-jaxrs/README | 7 - .../webapps/helloworld-jaxrs/pom.xml | 116 ------------- .../src/main/java/sample/HelloWorldResource.java | 68 -------- .../src/main/java/sample/HelloworldService.java | 25 --- .../main/java/sample/HelloworldServiceImpl.java | 28 --- .../src/main/webapp/WEB-INF/application | 14 -- .../src/main/webapp/WEB-INF/web.composite | 34 ---- .../src/main/webapp/WEB-INF/web.xml | 49 ------ .../src/test/java/itest/HelloworldTestCase.java | 43 ----- .../getting-started/webapps/helloworld-jms/README | 131 -------------- .../getting-started/webapps/helloworld-jms/pom.xml | 96 ----------- .../src/main/java/sample/HelloWorldClient.java | 37 ---- .../src/main/java/sample/HelloWorldService.java | 29 ---- .../main/java/sample/HelloWorldServiceImpl.java | 31 ---- .../src/main/webapp/META-INF/context.xml | 34 ---- .../src/main/webapp/WEB-INF/jetty-env.xml | 48 ------ .../src/main/webapp/WEB-INF/web.composite | 44 ----- .../helloworld-jms/src/main/webapp/WEB-INF/web.xml | 66 ------- .../helloworld-jms/src/main/webapp/hello.jsp | 41 ----- .../webapps/helloworld-js-client/README | 7 - .../webapps/helloworld-js-client/pom.xml | 104 ----------- .../src/main/java/sample/HelloworldService.java | 25 --- .../main/java/sample/HelloworldServiceImpl.java | 28 --- .../src/main/webapp/WEB-INF/web.composite | 36 ---- .../src/main/webapp/WEB-INF/web.xml | 41 ----- .../src/main/webapp/hello.html | 51 ------ .../src/test/java/itest/HelloworldTestCase.java | 77 --------- .../getting-started/webapps/helloworld-jsf/pom.xml | 99 ----------- .../src/main/java/sample/HelloWorldController.java | 56 ------ .../src/main/java/sample/HelloworldService.java | 25 --- .../main/java/sample/HelloworldServiceImpl.java | 27 --- .../src/main/webapp/WEB-INF/faces-config.xml | 51 ------ .../src/main/webapp/WEB-INF/web.composite | 34 ---- .../helloworld-jsf/src/main/webapp/WEB-INF/web.xml | 191 --------------------- .../helloworld-jsf/src/main/webapp/helloWorld.jsp | 40 ----- .../helloworld-jsf/src/main/webapp/index.jsp | 23 --- .../helloworld-jsf/src/main/webapp/page2.jsp | 38 ---- .../getting-started/webapps/helloworld-jsp/README | 7 - .../getting-started/webapps/helloworld-jsp/pom.xml | 98 ----------- .../src/main/java/sample/HelloworldService.java | 25 --- .../main/java/sample/HelloworldServiceImpl.java | 28 --- .../src/main/webapp/WEB-INF/web.composite | 34 ---- .../helloworld-jsp/src/main/webapp/WEB-INF/web.xml | 41 ----- .../helloworld-jsp/src/main/webapp/hello.jsp | 37 ---- .../src/test/java/itest/HelloworldTestCase.java | 53 ------ .../webapps/helloworld-servlet/README | 7 - .../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 ------ .../webapps/helloworld-stripes/pom.xml | 112 ------------ .../main/java/mystripes/action/BaseActionBean.java | 33 ---- .../main/java/mystripes/action/HomeActionBean.java | 45 ----- .../src/main/java/sample/HelloworldService.java | 25 --- .../main/java/sample/HelloworldServiceImpl.java | 28 --- .../src/main/resources/StripesResources.properties | 73 -------- .../src/main/resources/log4j.properties | 48 ------ .../src/main/webapp/WEB-INF/jsp/home.jsp | 26 --- .../src/main/webapp/WEB-INF/jsp/layout.jsp | 39 ----- .../src/main/webapp/WEB-INF/jsp/taglibs.jsp | 29 ---- .../src/main/webapp/WEB-INF/web.composite | 34 ---- .../src/main/webapp/WEB-INF/web.xml | 61 ------- .../helloworld-stripes/src/main/webapp/index.html | 24 --- .../helloworld-stripes/src/test/java/README | 7 - .../src/test/java/itest/HelloworldTestCase.java | 53 ------ .../trunk/samples/getting-started/webapps/pom.xml | 52 ------ 140 files changed, 3313 insertions(+), 3313 deletions(-) create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/application create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldClient.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/META-INF/context.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/hello.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/hello.html create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloWorldController.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/helloWorld.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/index.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/page2.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/hello.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/hello.html create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldService.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/StripesResources.properties create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/log4j.properties create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/index.html create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/implementation-webapp/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/hello.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/hello.html delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/index.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/page2.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/hello.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/hello.html delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/StripesResources.properties delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/log4j.properties delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/index.html delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/pom.xml (limited to 'sca-java-2.x/trunk/samples') diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/README b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/README new file mode 100644 index 0000000000..828aadb0f1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/README @@ -0,0 +1,7 @@ +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/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/pom.xml new file mode 100644 index 0000000000..f414d87837 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/pom.xml @@ -0,0 +1,116 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-jaxrs-webapp + war + Apache Tuscany SCA Sample Helloworld JAX-RS + + + + + + org.apache.tuscany.sca.shades + tuscany-base-nodep + 2.0-SNAPSHOT + + + + + org.apache.wink + wink-common + 1.1.1-incubating + + + org.apache.wink + wink-server + 1.1.1-incubating + + + org.slf4j + slf4j-api + 1.6.0 + + + + junit + junit + 4.8.1 + test + + + + net.sourceforge.htmlunit + htmlunit + 2.6 + test + + + + + + helloworld-jaxrs + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld-jaxrs + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java new file mode 100644 index 0000000000..42625b8a78 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * 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.util.Date; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; + +import org.oasisopen.sca.annotation.Reference; + +/** + * Simple example - Hello World! + *

+ * The SDK dispatches HTTP requests for URI + * http://[host]:[port]/helloworld-jaxrs/rest/world, where + * helloworld-jaxrs is the context root, to this class. A simple + * plain text entry is returned in HTTP response. + *

+ * The service document is available at URI + * http://[host]:[port]/helloworld-jaxrs/rest but it is empty because + * this simple demo doesn't contain any collection of resources. + *

+ * This resource must be registered within a JAX-RS application, this example + * uses the default usage of application /WEB-INF/application + */ +@Path("/world") +public class HelloWorldResource { + + @Reference + protected HelloworldService service; + + + /** + * This method is called by the SDK for HTTP GET method requests where the + * Accept header allows the Atom media type application/atom+xml. A + * SyndEntry is created with basic information. Serialization of the + * SyndEntry to Atom entry is performed by the SDK automatically. The + * default status code of 200 (OK) is returned in the response. + * + * @return SyndEntry of the requested resource + */ + @GET + @Produces("text/plain") + public String getClichedMessage() { + return service == null ? "SCA reference not injected" : service.sayHello("World"); + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..123774b936 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/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/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..66cef71a25 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java @@ -0,0 +1,28 @@ +/* + * 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/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/application new file mode 100644 index 0000000000..8ce781d6c8 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/application @@ -0,0 +1,14 @@ +# 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. +sample.HelloWorldResource \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..7ff71519e9 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..3c5726a818 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,49 @@ + + + + + Apache Tuscany Helloworld JAX-RS Sample + + + org.apache.tuscany.sca.host.webapp.TuscanyContextListener + + + + restSdkService + org.apache.wink.server.internal.servlet.RestServlet + + applicationConfigLocation + /WEB-INF/application + + + + deploymentConfiguration + org.apache.tuscany.sca.wink.TuscanyDeploymentConfiguration + + + + restSdkService + /rest/* + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java new file mode 100644 index 0000000000..50197cdfcb --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java @@ -0,0 +1,43 @@ +/* + * 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.assertEquals; + +import java.io.IOException; +import java.net.MalformedURLException; + +import org.junit.Test; + +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + +/** + */ +public class HelloworldTestCase { + + @Test + public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { + TextPage page = (TextPage)new WebClient().getPage("http://localhost:8085/helloworld-jaxrs/rest/world"); + assertEquals("Hello World", page.getContent()); + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/README b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/README new file mode 100644 index 0000000000..88bbe9adcb --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/README @@ -0,0 +1,131 @@ +JMS HelloWorld Sample +===================== +This sample demonstrates a simple webapp containing a hello world style client +and service using the JMS binding for request-response style messaging. + +The README in the samples directory (the directory above this) provides +general instructions about building and running samples. Take a look there +first. + +As this sample provides a web app there is a manual step where the WAR file +that contains the sample is copied to your web app container. If you just want +to give this sample a go deploy the WAR file (target/helloworld-jms.war ) +to you web application server. Alternatevly, the sample pom.xml is configured +with the Jetty plugin so you can run the it with Jetty by simply doing "mvn jetty:run". + +Once the web app is deployed use your browser to visit the following URL; + +http://localhost:8080/helloworld-jms + +The port and hostname will of course vary depending on your local installation. + +Configuring the JMS resources +----------------------------- + +The sample requires JMS resources be manually configured in the server environment, these are: + +- a JMS connection factory named "ConnectionFactory" +- a JMS queue named "HelloWorldService" + +See the following for how to define these resources depending on the application server being used: + +Tuscany with embedded ActiveMQ broker +------------------------------------- + + +Apache Tomcat +------------- + +No configuration is necessary for Tomcat as the sample WAR includes everything pre-configured to run +an ActiveMQ embedded JMS broker and to configure the JMS resources in JNDI. + +The JNDI resources are configured in the META-INF/comtext.xml file, for more information on running +ActiveMQ in Tomcat see: http://activemq.apache.org/tomcat.html + + +Apache Geronimo +--------------- + +For Apache Geronimo 2.0.1 (2.0.2 fails to define JMS resources for me) + +Logon to the Geronimo Server Console (http://localhost:8080/console, uid system, pswd manager) + +In the Console Navigation on the left under Services click JMS Resources + +At the bottom of the JMS Resources panel click under Create a new JMS Resource Group click For ActiveMQ + +In Resource Group Name enter "MyRGN" and click next + +At JMS Resource Group click Add Connection Factory + +For JMS Factory Type choose javax.jms.ConnectionFactory and click Next + +In Connection Factory Name enter "ConnectionFactory" and click Next + +Click Add destination + +For JMS Destination Type choose javax.jms.Queue and click Next + +Enter "HelloWorldService" for both Message Destination Name and PhysicalName and click Next + +Click Deploy Now + +Thats it, you're done. + + +WebSphere +--------- + +To define the JMS resources in a new WebSphere Application Server 6.1 installation: + +1) First define a Service integration bus: + +Logon to the WebSphere Integrated Solutions Console (http://localhost:9060/ibm/console) + +On the Left hand menu expand Service integration, and click on Buses. + +In the Buses panel click on New + +Enter a name for the bus, eg MyBus, and click Next, and then click Finish and Save the changes. + +In the Buses panel click on MyBus + +Find the Topology secion and click on Bus members + +Click on Add, leave the defaults and click Next, Next, Next, Finish, and Save the changes. + +Restart WebSphere and when back up logon back on to the Integrated Solutions Console + +2) Now define the JMS rescources + +On the Left hand menu expand Resources, and JMS and click on Connection Facotories. + +In the Connection factories panel click New. + +Leave the Default messaging provider and click OK + +Enter "ConnectionFactory" in the Name and JNDI name and in the Bus name in the Connection pane choose MyBus and click OK + +On the Left hand menu in JMS click on Queues + +In the Queues panel click New, accept the defaults and click OK + +Enter "HelloWorldService" for the Name and JNDI name and in the Bus name in the Connection pane choose MyBus, +and then in the Queue name drop down list choose "Create SIB destination" + +In the Set queue attributes panel enter "HelloWorldService" for the Identifier and click Next, Next, and Finish + +That should take you back to the Queues panel where you can click OK to create the new JMS queue. + +Save the changes + +Restart WebSphere and you're done. + + + +Others... +--------- + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/pom.xml new file mode 100644 index 0000000000..326422ed7b --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/pom.xml @@ -0,0 +1,96 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-jms-webapp + war + Apache Tuscany SCA Sample JMS HelloWorld in a WebApp + + + + + org.apache.tuscany.sca.shades + tuscany-base + 2.0-SNAPSHOT + + + org.apache.tuscany.sca.shades + tuscany-jms + 2.0-SNAPSHOT + + + + org.apache.activemq + activemq-core + 5.3.0 + runtime + + + + + + helloworld-jms + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld-jms + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldClient.java new file mode 100644 index 0000000000..f209f11605 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldClient.java @@ -0,0 +1,37 @@ +/* + * 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; + +/** + * The HelloWorld client implementation + */ +public class HelloWorldClient implements HelloWorldService { + + HelloWorldService helloWorldRef; + + public String sayHello(String name) { + System.out.println("HelloWorldClient.sayHello " + name); + return helloWorldRef.sayHello(name); + } + + public void setHelloWorldRef(HelloWorldService helloWorldRef) { + System.out.println("HelloWorldClient.setHelloWorldService " + helloWorldRef); + this.helloWorldRef = helloWorldRef; + } +} \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldService.java new file mode 100644 index 0000000000..df2a852161 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldService.java @@ -0,0 +1,29 @@ +/* + * 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 org.oasisopen.sca.annotation.Remotable; + +/** + * The interface for the helloworld service + */ +@Remotable +public interface HelloWorldService { + public String sayHello(String name); +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java new file mode 100644 index 0000000000..c09af51e23 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java @@ -0,0 +1,31 @@ +/* + * 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; + +/** + * This class implements the HelloWorld service. + */ +public class HelloWorldServiceImpl implements HelloWorldService { + + public String sayHello(String name) { + System.out.println("HelloWorldServiceImpl.sayHello " + name); + return "Hello " + name; + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/META-INF/context.xml new file mode 100644 index 0000000000..7575edfc29 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/META-INF/context.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml new file mode 100644 index 0000000000..a8cd27f6c6 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + ConnectionFactory + + + vm://localhost?broker.persistent=false + + + + + + HelloWorldService + + + DEMO + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..c51985bc30 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..86710435ae --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,66 @@ + + + + + + + Apache Tuscany JMS Web Service Sample + + + tuscany + org.apache.tuscany.sca.host.webapp.TuscanyServletFilter + + + + tuscany + /* + + + + hello.jsp + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/hello.jsp new file mode 100644 index 0000000000..9ae037f2c2 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jms/src/main/webapp/hello.jsp @@ -0,0 +1,41 @@ +<%-- + * 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. +--%> + +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %> + + + + +HelloWorld JMS sample + + + +If this sample is working correctly you should see "Hello World" on the next line... +

+<%= service.sayHello("world") %> +

+If you do not see "Hello World" on the line above then there has been a problem. +

+The sample requires JMS resources be manually configured in the server environment, these are: +a JMS connection factory named "ConnectionFactory", and a destination queues named "HelloWorldService". +See the sample README file for more information. + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/README b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/README new file mode 100644 index 0000000000..828aadb0f1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/README @@ -0,0 +1,7 @@ +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/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/pom.xml new file mode 100644 index 0000000000..388df0913e --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/pom.xml @@ -0,0 +1,104 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-js-client-webapp + war + Apache Tuscany SCA Sample Helloworld Javascript Client + + + + + org.apache.tuscany.sca.shades + tuscany-base + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca.shades + tuscany-json-nodep + 2.0-SNAPSHOT + + + + junit + junit + 4.8.1 + test + + + + net.sourceforge.htmlunit + htmlunit + 2.6 + test + + + + + + helloworld-js-client + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld-js-client + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..123774b936 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/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/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..66cef71a25 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java @@ -0,0 +1,28 @@ +/* + * 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/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..d41a8535e2 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..babeb7b203 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ + + + + + Apache Tuscany Helloworld JSP Sample + + + tuscany + org.apache.tuscany.sca.host.webapp.TuscanyServletFilter + + + + tuscany + /* + + + + hello.html + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/hello.html new file mode 100644 index 0000000000..12024cc4d3 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/main/webapp/hello.html @@ -0,0 +1,51 @@ + + + + + Apache Tuscany Helloworld Javascript Client Sample + + + + + + + + + +

Apache Tuscany Helloworld Javascript Client Sample

+ + + + + +
+ + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java new file mode 100644 index 0000000000..de41997a59 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java @@ -0,0 +1,77 @@ +/* + * 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.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLEncoder; + +import org.junit.Ignore; +import org.junit.Test; + +/** + * Verfiy the serverside code is working, not sure how to easily itest the browser javascript code + */ +@Ignore("TUSCANY-3688") +public class HelloworldTestCase { + + @Test + public void testA() throws MalformedURLException, IOException { + + URL url = new URL("http://localhost:8085/helloworld-js-client/org.oasisopen.sca.componentContext.js/foo/call/plaincall/service.sayHello.dwr"); + URLConnection conn = url.openConnection(); + conn.setDoOutput(true); + OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); + + // to find this run the sample through TCPMON to capture the messages + + String data = URLEncoder.encode("callCount", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8"); + data += "&" + URLEncoder.encode("page", "UTF-8") + "=" + URLEncoder.encode("/helloworld-js-client/", "UTF-8"); + data += "&" + URLEncoder.encode("httpSessionId", "UTF-8") + "=" + URLEncoder.encode("", "UTF-8"); + data += "&" + URLEncoder.encode("scriptSessionId", "UTF-8") + "=" + URLEncoder.encode("A023DA664E56F075491BE1B87B37B02671", "UTF-8"); + data += "&" + URLEncoder.encode("c0-scriptName", "UTF-8") + "=" + URLEncoder.encode("service", "UTF-8"); + data += "&" + URLEncoder.encode("c0-methodName", "UTF-8") + "=" + URLEncoder.encode("sayHello", "UTF-8"); + data += "&" + URLEncoder.encode("c0-id", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8"); + data += "&" + URLEncoder.encode("c0-param0", "UTF-8") + "=" + URLEncoder.encode("string:petra", "UTF-8"); + data += "&" + URLEncoder.encode("batchId", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8"); + + wr.write(data); + wr.flush(); + + BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream())); + rd.readLine(); // throw 'allowScriptTagRemoting is false.'; + rd.readLine(); //#DWR-INSERT + rd.readLine(); //#DWR-REPLY + String line = rd.readLine(); // dwr.engine._remoteHandleCallback('0','0',"Hello petra"); + wr.close(); + rd.close(); + + assertTrue(line.endsWith("\"Hello petra\");")); + + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/pom.xml new file mode 100644 index 0000000000..6f2b820e4c --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/pom.xml @@ -0,0 +1,99 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-jsf-webapp + Apache Tuscany SCA Sample Helloworld JSF + war + + + + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-SNAPSHOT + compile + + + + org.apache.tuscany.sca + tuscany-implementation-web-runtime + 2.0-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-myfaces + 2.0-SNAPSHOT + runtime + + + + + + helloworld-jsf + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld-jsf + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloWorldController.java new file mode 100644 index 0000000000..9c9f541997 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloWorldController.java @@ -0,0 +1,56 @@ +/* + * 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 org.oasisopen.sca.annotation.Reference; + +/** + * + */ +public class HelloWorldController { + + @Reference + protected HelloworldService service; + + private String name; + + public HelloWorldController() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + /** + * Method that is backed to a submit button of a form. + */ + public String send() { + if (service == null) { + name = "reference not injected!"; + } else { + name = service.sayHello(name); + } + return "success"; + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..53ff7a5ca1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/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/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..23925d6c69 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/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/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml new file mode 100644 index 0000000000..99cee9faeb --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml @@ -0,0 +1,51 @@ + + + + + + + helloWorld + sample.HelloWorldController + request + + + + + /helloWorld.jsp + + success + /page2.jsp + + + + + + /page2.jsp + + back + /helloWorld.jsp + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..8976adde3c --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..fecbd7c79b --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,191 @@ + + + + + MyProject web.xml + + + + org.apache.tuscany.sca.host.webapp.TuscanyContextListener + + + org.apache.myfaces.config.annotation.LifecycleProvider + org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider + + + + + State saving method: "client" or "server" (= default) + See JSF Specification 2.5.3 + javax.faces.STATE_SAVING_METHOD + client + + + Only applicable if state saving method is "server" (= default). + Defines the amount (default = 20) of the latest views are stored in session. + org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION + 20 + + + Only applicable if state saving method is "server" (= default). + If true (default) the state will be serialized to a byte stream before it + is written to the session. + If false the state will not be serialized to a byte stream. + org.apache.myfaces.SERIALIZE_STATE_IN_SESSION + true + + + Only applicable if state saving method is "server" (= default) and if + org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default) + If true (default) the serialized state will be compressed before it + is written to the session. If false the state will not be compressed. + org.apache.myfaces.COMPRESS_STATE_IN_SESSION + true + + + This parameter tells MyFaces if javascript code should be allowed in the + rendered HTML output. + If javascript is allowed, command_link anchors will have javascript code + that submits the corresponding form. + If javascript is not allowed, the state saving info and nested parameters + will be added as url parameters. + Default: "true" + org.apache.myfaces.ALLOW_JAVASCRIPT + true + + + org.apache.myfaces.DETECT_JAVASCRIPT + false + + + If true, rendered HTML code will be formatted, so that it is "human readable". + i.e. additional line separators and whitespace will be written, that do not + influence the HTML code. + Default: "true" + org.apache.myfaces.PRETTY_HTML + true + + + If true, a javascript function will be rendered that is able to restore the + former vertical scroll on every request. Convenient feature if you have pages + with long lists and you do not want the browser page to always jump to the top + if you trigger a link or button action that stays on the same page. + Default: "false" + org.apache.myfaces.AUTO_SCROLL + true + + + + Used for encrypting view state. Only relevant for client side + state saving. See MyFaces wiki/web site documentation for instructions + on how to configure an application for diffenent encryption strengths. + + org.apache.myfaces.SECRET + NzY1NDMyMTA= + + + + + Validate managed beans, navigation rules and ensure that forms are not nested. + + org.apache.myfaces.VALIDATE + true + + + + + Treat readonly same as if disabled attribute was set for select elements. + + org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS + true + + + + + Use the defined class as the class which will be called when a resource is added to the + ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add + custom components and want to use the ExtensionFilter, you need to provide your custom implementation here. + + org.apache.myfaces.ADD_RESOURCE_CLASS + org.apache.myfaces.renderkit.html.util.DefaultAddResource + + + + + Virtual path in the URL which triggers loading of resources for the MyFaces extended components + in the ExtensionFilter. + + org.apache.myfaces.RESOURCE_VIRTUAL_PATH + /faces/myFacesExtensionResource + + + + + Check if the extensions-filter has been properly configured. + + org.apache.myfaces.CHECK_EXTENSIONS_FILTER + true + + + + + Define partial state saving as true/false. + + javax.faces.PARTIAL_STATE_SAVING_METHOD + false + + + + + org.apache.myfaces.webapp.StartupServletContextListener + + + + + Faces Servlet + javax.faces.webapp.FacesServlet + 1 + + + + + Faces Servlet + *.jsf + + + + + index.jsp + index.html + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/helloWorld.jsp new file mode 100644 index 0000000000..189c142c99 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/helloWorld.jsp @@ -0,0 +1,40 @@ + + +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> + + + + Apache Tuscany Helloworld JSF sample + + +

Apache Tuscany Helloworld JSF sample

+ + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/index.jsp new file mode 100644 index 0000000000..5ca296e115 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/index.jsp @@ -0,0 +1,23 @@ + + +<%@ page session="false"%> +<% +response.sendRedirect("helloWorld.jsf"); +%> diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/page2.jsp new file mode 100644 index 0000000000..89259021c7 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsf/src/main/webapp/page2.jsp @@ -0,0 +1,38 @@ + + +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> + + + Apache Tuscany Helloworld JSF sample + + +

Apache Tuscany Helloworld JSF sample

+ + + +
+ + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/README b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/README new file mode 100644 index 0000000000..828aadb0f1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/README @@ -0,0 +1,7 @@ +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/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/pom.xml new file mode 100644 index 0000000000..05a3e23895 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/pom.xml @@ -0,0 +1,98 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-jsp-webapp + war + Apache Tuscany SCA Sample Helloworld JSP + + + + + org.apache.tuscany.sca.shades + tuscany-base + 2.0-SNAPSHOT + + + + junit + junit + 4.8.1 + test + + + + net.sourceforge.htmlunit + htmlunit + 2.6 + test + + + + + + helloworld-jsp + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld-jsp + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..53ff7a5ca1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/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/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..a22c095f29 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java @@ -0,0 +1,28 @@ +/* + * 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/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..8976adde3c --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..fa1f7ad7b9 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ + + + + + Apache Tuscany Helloworld JSP Sample + + + tuscany + org.apache.tuscany.sca.host.webapp.TuscanyServletFilter + + + + tuscany + /* + + + + hello.jsp + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/hello.jsp new file mode 100644 index 0000000000..ffd01cca73 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/main/webapp/hello.jsp @@ -0,0 +1,37 @@ + + +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %> + + + + + + +

Apache Tuscany Helloworld JSP Sample

+ + Calling HelloworldService sayHello("world") returns: + +

+ + <%= service.sayHello("world") %> + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java new file mode 100644 index 0000000000..665957b0eb --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java @@ -0,0 +1,53 @@ +/* + * 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.assertEquals; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Iterator; + +import org.junit.Test; + +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlParagraph; + +/** + */ +public class HelloworldTestCase { + + @Test + public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { + HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp"); + Iterator ss = page.getAllHtmlChildElements().iterator(); + while(ss.hasNext()) { + HtmlElement htmlElement = (HtmlElement) ss.next(); + if( htmlElement instanceof HtmlParagraph) { + assertEquals("Hello world", htmlElement.asText()); + break; + } + } + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/README b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/README new file mode 100644 index 0000000000..828aadb0f1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/README @@ -0,0 +1,7 @@ +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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/pom.xml new file mode 100644 index 0000000000..45725aaf72 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/pom.xml @@ -0,0 +1,105 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-servlet-webapp + war + Apache Tuscany SCA Sample Helloworld Servlet + + + + + org.apache.tuscany.sca.shades + tuscany-base-nodep + 2.0-SNAPSHOT + + + + 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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..2e43e09897 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..9e79276704 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java new file mode 100644 index 0000000000..bb72c50f6a --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..8976adde3c --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..a91b3fc96b --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/main/webapp/hello.html new file mode 100644 index 0000000000..c4484916aa --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/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/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java new file mode 100644 index 0000000000..61d722da1f --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/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")); + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/pom.xml new file mode 100644 index 0000000000..16259aba62 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/pom.xml @@ -0,0 +1,112 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-stripes-webapp + war + Apache Tuscany SCA Sample Helloworld using Stripes + + + + + + org.apache.tuscany.sca.shades + tuscany-base + 2.0-SNAPSHOT + + + + + net.sourceforge.stripes + stripes + 1.5.2 + + + + taglibs + standard + 1.1.2 + + + + junit + junit + 4.8.1 + test + + + + net.sourceforge.htmlunit + htmlunit + 2.6 + test + + + + + + helloworld-stripes + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld-stripes + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java new file mode 100644 index 0000000000..0ab02682ac --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java @@ -0,0 +1,33 @@ +/* + * 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 mystripes.action; + +import net.sourceforge.stripes.action.ActionBean; +import net.sourceforge.stripes.action.ActionBeanContext; + +public class BaseActionBean implements ActionBean { + private ActionBeanContext context; + + public ActionBeanContext getContext() { + return context; + } + public void setContext(ActionBeanContext context) { + this.context = context; + } +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java new file mode 100644 index 0000000000..0385c92369 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java @@ -0,0 +1,45 @@ +/* + * 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 mystripes.action; + +import net.sourceforge.stripes.action.DefaultHandler; +import net.sourceforge.stripes.action.ForwardResolution; +import net.sourceforge.stripes.action.Resolution; +import net.sourceforge.stripes.action.UrlBinding; + +import org.oasisopen.sca.annotation.Reference; + +import sample.HelloworldService; + +@UrlBinding("/Home.htm") +public class HomeActionBean extends BaseActionBean { + + @Reference + HelloworldService service; + + @DefaultHandler + public Resolution view() { + return new ForwardResolution("/WEB-INF/jsp/home.jsp"); + } + + public String getHello() { + return service.sayHello("world"); + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldService.java new file mode 100644 index 0000000000..53ff7a5ca1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/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/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java new file mode 100644 index 0000000000..a22c095f29 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java @@ -0,0 +1,28 @@ +/* + * 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/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/StripesResources.properties new file mode 100644 index 0000000000..902842a19e --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/StripesResources.properties @@ -0,0 +1,73 @@ +# +# 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. +# + +# Resource strings used by the tag when there are no nested tags +stripes.errors.header=
Please fix the following errors:
    +stripes.errors.beforeError=
  1. +stripes.errors.afterError=
    2. +stripes.errors.footer=
+ +# Resource strings used by the tag when displaying errors for a +# specific field (e.g. ). If not supplied the +# values above will be used instead. +stripes.fieldErrors.header= +stripes.fieldErrors.beforeError= +stripes.fieldErrors.afterError=
+stripes.fieldErrors.footer= + +# Resource strings used by the stripes:messages tag +stripes.messages.header=
    +stripes.messages.beforeMessage=
  • +stripes.messages.afterMessage=
    • +stripes.messages.footer=
+ +# Validation error messages produced by Stripes' built-in converter classes. These +# are default error messages and can be overridden on per-field and per-form levels. +# Using the 'invalidNumber' error for a field 'age' of a form posting to +# '/user/Profile.action', the keys looked for (in order) would be: +# 1: /user/Profile.action.age.invalidNumber +# 2: /user/Profile.action.age.errorMessage +# 3: age.errorMessage +# 4: /user/Profile.action.invalidNumber +# 5: converter.number.invalidNumber +converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number +converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} +converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} +converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} +converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} +converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0} +converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date +converter.email.invalidEmail=The value ({1}) entered is not a valid email address +converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number + +# Validation error messages produced by Stripes' annotation based validations. These +# are default error messages and can be overridden on per-field and per-form levels. +# Using the 'valueNotPresent' required field error for a field 'username' of a form +# posting to '/user/Register.action', the keys looked for (in order) would be: +# 1: /user/Register.action.username.valueNotPresent +# 2: /user/Register.action.username.errorMessage +# 3: username.errorMessage +# 4: /user/Register.action.valueNotPresent +# 5: validation.required.valueNotPresent +validation.required.valueNotPresent={0} is a required field +validation.minlength.valueTooShort={0} must be at least {2} characters long +validation.maxlength.valueTooLong={0} must be no more than {2} characters long +validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2} +validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2} +validation.mask.valueDoesNotMatch={1} is not a valid {0} +validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid +validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/log4j.properties new file mode 100644 index 0000000000..2741999098 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/resources/log4j.properties @@ -0,0 +1,48 @@ +# +# 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. +# + +# log4j.properties + +# Set up a logger to the console +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n + +# Use this to only see log messages beyond a certain threshold in the console +#log4j.appender.stdout.Threshold=WARN + +# Set up a logger to a log file +log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender +log4j.appender.logfile.layout=org.apache.log4j.PatternLayout +log4j.appender.logfile.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n +log4j.appender.logfile.File=${user.home}/stripesquick.log +log4j.appender.logfile.DatePattern='.'yyyy-MM-dd + +# Use this to only see log messages beyond a certain threshold in the log file +#log4j.appender.logfile.Threshold=WARN + +# Logger settings +log4j.rootLogger=INFO, stdout, logfile + +# Valid levels are TRACE, DEBUG, INFO, WARN, ERROR, FATAL +# Change to TRACE or DEBUG to see more log messages +log4j.logger.net.sourceforge.stripes=WARN +log4j.logger.org.stripesbook.quickstart=INFO +log4j.logger.org.mortbay.log=INFO +log4j.logger.org=WARN +log4j.logger.com=WARN +log4j.logger.net=WARN diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp new file mode 100644 index 0000000000..0681c1f2bf --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp @@ -0,0 +1,26 @@ + +<%@ include file="/WEB-INF/jsp/taglibs.jsp" %> + + + +

sayHello returns: ${actionBean.hello}

+

Congratulations, you've set up a Stripes SCA project!

+ + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp new file mode 100644 index 0000000000..d0fb716b80 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp @@ -0,0 +1,39 @@ + +<%@ include file="/WEB-INF/jsp/taglibs.jsp" %> + + + + + + + ${title} + + + + + +
+ + +
+ + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp new file mode 100644 index 0000000000..f85602fcfa --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp @@ -0,0 +1,29 @@ + +<%-- Stripes TLD --%> +<%@ taglib prefix="s" uri="http://stripes.sourceforge.net/stripes.tld" %> +<%@ taglib prefix="sdyn" uri="http://stripes.sourceforge.net/stripes-dynattr.tld" %> + +<%-- JSTL TLDs --%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + +<%-- This is so that you can conveniently refer to the context path with ${contextPath} --%> + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..8976adde3c --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..f01584cc2f --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,61 @@ + + + + + Apache Tuscany Helloworld Stripes Sample + + + org.apache.tuscany.sca.host.webapp.TuscanyContextListener + + + + StripesFilter + net.sourceforge.stripes.controller.StripesFilter + + ActionResolver.Packages + mystripes.action + + + Extension.Packages + org.apache.tuscany.sca.stripes + + + + + DispatcherServlet + net.sourceforge.stripes.controller.DispatcherServlet + 1 + + + + StripesFilter + DispatcherServlet + REQUEST + FORWARD + + + + DispatcherServlet + *.htm + + + + index.html + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/index.html new file mode 100644 index 0000000000..c79d29e6a5 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/main/webapp/index.html @@ -0,0 +1,24 @@ + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/README b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/README new file mode 100644 index 0000000000..828aadb0f1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/README @@ -0,0 +1,7 @@ +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/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java new file mode 100644 index 0000000000..7f4359fa43 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java @@ -0,0 +1,53 @@ +/* + * 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.assertEquals; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Iterator; + +import org.junit.Test; + +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlParagraph; + +/** + */ +public class HelloworldTestCase { + + @Test + public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { + HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-stripes"); + Iterator ss = page.getAllHtmlChildElements().iterator(); + while(ss.hasNext()) { + HtmlElement htmlElement = (HtmlElement) ss.next(); + if( htmlElement instanceof HtmlParagraph) { + assertEquals("sayHello returns: Hello world", htmlElement.asText()); + break; + } + } + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/pom.xml new file mode 100644 index 0000000000..f715c8eb23 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/implementation-webapp/pom.xml @@ -0,0 +1,52 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../pom.xml + + tuscany-samples-getting-started-webapps + pom + Apache Tuscany SCA Getting Started Sample Web Applications + + + + default + + true + + + helloworld + helloworld-bpel + helloworld-jaxrs + helloworld-jms + helloworld-js-client + helloworld-jsf + helloworld-jsp + helloworld-servlet + helloworld-spring + helloworld-stripes + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/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/trunk/samples/getting-started/webapps/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/pom.xml deleted file mode 100644 index f414d87837..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-jaxrs-webapp - war - Apache Tuscany SCA Sample Helloworld JAX-RS - - - - - - org.apache.tuscany.sca.shades - tuscany-base-nodep - 2.0-SNAPSHOT - - - - - org.apache.wink - wink-common - 1.1.1-incubating - - - org.apache.wink - wink-server - 1.1.1-incubating - - - org.slf4j - slf4j-api - 1.6.0 - - - - junit - junit - 4.8.1 - test - - - - net.sourceforge.htmlunit - htmlunit - 2.6 - test - - - - - - helloworld-jaxrs - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-jaxrs - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java deleted file mode 100644 index 42625b8a78..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java +++ /dev/null @@ -1,68 +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.util.Date; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - -import org.oasisopen.sca.annotation.Reference; - -/** - * Simple example - Hello World! - *

- * The SDK dispatches HTTP requests for URI - * http://[host]:[port]/helloworld-jaxrs/rest/world, where - * helloworld-jaxrs is the context root, to this class. A simple - * plain text entry is returned in HTTP response. - *

- * The service document is available at URI - * http://[host]:[port]/helloworld-jaxrs/rest but it is empty because - * this simple demo doesn't contain any collection of resources. - *

- * This resource must be registered within a JAX-RS application, this example - * uses the default usage of application /WEB-INF/application - */ -@Path("/world") -public class HelloWorldResource { - - @Reference - protected HelloworldService service; - - - /** - * This method is called by the SDK for HTTP GET method requests where the - * Accept header allows the Atom media type application/atom+xml. A - * SyndEntry is created with basic information. Serialization of the - * SyndEntry to Atom entry is performed by the SDK automatically. The - * default status code of 200 (OK) is returned in the response. - * - * @return SyndEntry of the requested resource - */ - @GET - @Produces("text/plain") - public String getClichedMessage() { - return service == null ? "SCA reference not injected" : service.sayHello("World"); - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 123774b936..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/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/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 66cef71a25..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application deleted file mode 100644 index 8ce781d6c8..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application +++ /dev/null @@ -1,14 +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. -sample.HelloWorldResource \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 7ff71519e9..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 3c5726a818..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - Apache Tuscany Helloworld JAX-RS Sample - - - org.apache.tuscany.sca.host.webapp.TuscanyContextListener - - - - restSdkService - org.apache.wink.server.internal.servlet.RestServlet - - applicationConfigLocation - /WEB-INF/application - - - - deploymentConfiguration - org.apache.tuscany.sca.wink.TuscanyDeploymentConfiguration - - - - restSdkService - /rest/* - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 50197cdfcb..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,43 +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.assertEquals; - -import java.io.IOException; -import java.net.MalformedURLException; - -import org.junit.Test; - -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; - -/** - */ -public class HelloworldTestCase { - - @Test - public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { - TextPage page = (TextPage)new WebClient().getPage("http://localhost:8085/helloworld-jaxrs/rest/world"); - assertEquals("Hello World", page.getContent()); - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/README deleted file mode 100644 index 88bbe9adcb..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/README +++ /dev/null @@ -1,131 +0,0 @@ -JMS HelloWorld Sample -===================== -This sample demonstrates a simple webapp containing a hello world style client -and service using the JMS binding for request-response style messaging. - -The README in the samples directory (the directory above this) provides -general instructions about building and running samples. Take a look there -first. - -As this sample provides a web app there is a manual step where the WAR file -that contains the sample is copied to your web app container. If you just want -to give this sample a go deploy the WAR file (target/helloworld-jms.war ) -to you web application server. Alternatevly, the sample pom.xml is configured -with the Jetty plugin so you can run the it with Jetty by simply doing "mvn jetty:run". - -Once the web app is deployed use your browser to visit the following URL; - -http://localhost:8080/helloworld-jms - -The port and hostname will of course vary depending on your local installation. - -Configuring the JMS resources ------------------------------ - -The sample requires JMS resources be manually configured in the server environment, these are: - -- a JMS connection factory named "ConnectionFactory" -- a JMS queue named "HelloWorldService" - -See the following for how to define these resources depending on the application server being used: - -Tuscany with embedded ActiveMQ broker -------------------------------------- - - -Apache Tomcat -------------- - -No configuration is necessary for Tomcat as the sample WAR includes everything pre-configured to run -an ActiveMQ embedded JMS broker and to configure the JMS resources in JNDI. - -The JNDI resources are configured in the META-INF/comtext.xml file, for more information on running -ActiveMQ in Tomcat see: http://activemq.apache.org/tomcat.html - - -Apache Geronimo ---------------- - -For Apache Geronimo 2.0.1 (2.0.2 fails to define JMS resources for me) - -Logon to the Geronimo Server Console (http://localhost:8080/console, uid system, pswd manager) - -In the Console Navigation on the left under Services click JMS Resources - -At the bottom of the JMS Resources panel click under Create a new JMS Resource Group click For ActiveMQ - -In Resource Group Name enter "MyRGN" and click next - -At JMS Resource Group click Add Connection Factory - -For JMS Factory Type choose javax.jms.ConnectionFactory and click Next - -In Connection Factory Name enter "ConnectionFactory" and click Next - -Click Add destination - -For JMS Destination Type choose javax.jms.Queue and click Next - -Enter "HelloWorldService" for both Message Destination Name and PhysicalName and click Next - -Click Deploy Now - -Thats it, you're done. - - -WebSphere ---------- - -To define the JMS resources in a new WebSphere Application Server 6.1 installation: - -1) First define a Service integration bus: - -Logon to the WebSphere Integrated Solutions Console (http://localhost:9060/ibm/console) - -On the Left hand menu expand Service integration, and click on Buses. - -In the Buses panel click on New - -Enter a name for the bus, eg MyBus, and click Next, and then click Finish and Save the changes. - -In the Buses panel click on MyBus - -Find the Topology secion and click on Bus members - -Click on Add, leave the defaults and click Next, Next, Next, Finish, and Save the changes. - -Restart WebSphere and when back up logon back on to the Integrated Solutions Console - -2) Now define the JMS rescources - -On the Left hand menu expand Resources, and JMS and click on Connection Facotories. - -In the Connection factories panel click New. - -Leave the Default messaging provider and click OK - -Enter "ConnectionFactory" in the Name and JNDI name and in the Bus name in the Connection pane choose MyBus and click OK - -On the Left hand menu in JMS click on Queues - -In the Queues panel click New, accept the defaults and click OK - -Enter "HelloWorldService" for the Name and JNDI name and in the Bus name in the Connection pane choose MyBus, -and then in the Queue name drop down list choose "Create SIB destination" - -In the Set queue attributes panel enter "HelloWorldService" for the Identifier and click Next, Next, and Finish - -That should take you back to the Queues panel where you can click OK to create the new JMS queue. - -Save the changes - -Restart WebSphere and you're done. - - - -Others... ---------- - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/pom.xml deleted file mode 100644 index 326422ed7b..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-jms-webapp - war - Apache Tuscany SCA Sample JMS HelloWorld in a WebApp - - - - - org.apache.tuscany.sca.shades - tuscany-base - 2.0-SNAPSHOT - - - org.apache.tuscany.sca.shades - tuscany-jms - 2.0-SNAPSHOT - - - - org.apache.activemq - activemq-core - 5.3.0 - runtime - - - - - - helloworld-jms - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-jms - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java deleted file mode 100644 index f209f11605..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java +++ /dev/null @@ -1,37 +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; - -/** - * The HelloWorld client implementation - */ -public class HelloWorldClient implements HelloWorldService { - - HelloWorldService helloWorldRef; - - public String sayHello(String name) { - System.out.println("HelloWorldClient.sayHello " + name); - return helloWorldRef.sayHello(name); - } - - public void setHelloWorldRef(HelloWorldService helloWorldRef) { - System.out.println("HelloWorldClient.setHelloWorldService " + helloWorldRef); - this.helloWorldRef = helloWorldRef; - } -} \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java deleted file mode 100644 index df2a852161..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java +++ /dev/null @@ -1,29 +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 org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the helloworld service - */ -@Remotable -public interface HelloWorldService { - public String sayHello(String name); -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java deleted file mode 100644 index c09af51e23..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java +++ /dev/null @@ -1,31 +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; - -/** - * This class implements the HelloWorld service. - */ -public class HelloWorldServiceImpl implements HelloWorldService { - - public String sayHello(String name) { - System.out.println("HelloWorldServiceImpl.sayHello " + name); - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml deleted file mode 100644 index 7575edfc29..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml deleted file mode 100644 index a8cd27f6c6..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - ConnectionFactory - - - vm://localhost?broker.persistent=false - - - - - - HelloWorldService - - - DEMO - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index c51985bc30..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 86710435ae..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - Apache Tuscany JMS Web Service Sample - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - - hello.jsp - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/hello.jsp deleted file mode 100644 index 9ae037f2c2..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jms/src/main/webapp/hello.jsp +++ /dev/null @@ -1,41 +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. ---%> - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %> - - - - -HelloWorld JMS sample - - - -If this sample is working correctly you should see "Hello World" on the next line... -

-<%= service.sayHello("world") %> -

-If you do not see "Hello World" on the line above then there has been a problem. -

-The sample requires JMS resources be manually configured in the server environment, these are: -a JMS connection factory named "ConnectionFactory", and a destination queues named "HelloWorldService". -See the sample README file for more information. - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/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/trunk/samples/getting-started/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/pom.xml deleted file mode 100644 index 388df0913e..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-js-client-webapp - war - Apache Tuscany SCA Sample Helloworld Javascript Client - - - - - org.apache.tuscany.sca.shades - tuscany-base - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca.shades - tuscany-json-nodep - 2.0-SNAPSHOT - - - - junit - junit - 4.8.1 - test - - - - net.sourceforge.htmlunit - htmlunit - 2.6 - test - - - - - - helloworld-js-client - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-js-client - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 123774b936..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/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/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 66cef71a25..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index d41a8535e2..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index babeb7b203..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Apache Tuscany Helloworld JSP Sample - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - - hello.html - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/hello.html deleted file mode 100644 index 12024cc4d3..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/main/webapp/hello.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Apache Tuscany Helloworld Javascript Client Sample - - - - - - - - - -

Apache Tuscany Helloworld Javascript Client Sample

- - - - - -
- - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index de41997a59..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,77 +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.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; - -import org.junit.Ignore; -import org.junit.Test; - -/** - * Verfiy the serverside code is working, not sure how to easily itest the browser javascript code - */ -@Ignore("TUSCANY-3688") -public class HelloworldTestCase { - - @Test - public void testA() throws MalformedURLException, IOException { - - URL url = new URL("http://localhost:8085/helloworld-js-client/org.oasisopen.sca.componentContext.js/foo/call/plaincall/service.sayHello.dwr"); - URLConnection conn = url.openConnection(); - conn.setDoOutput(true); - OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); - - // to find this run the sample through TCPMON to capture the messages - - String data = URLEncoder.encode("callCount", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8"); - data += "&" + URLEncoder.encode("page", "UTF-8") + "=" + URLEncoder.encode("/helloworld-js-client/", "UTF-8"); - data += "&" + URLEncoder.encode("httpSessionId", "UTF-8") + "=" + URLEncoder.encode("", "UTF-8"); - data += "&" + URLEncoder.encode("scriptSessionId", "UTF-8") + "=" + URLEncoder.encode("A023DA664E56F075491BE1B87B37B02671", "UTF-8"); - data += "&" + URLEncoder.encode("c0-scriptName", "UTF-8") + "=" + URLEncoder.encode("service", "UTF-8"); - data += "&" + URLEncoder.encode("c0-methodName", "UTF-8") + "=" + URLEncoder.encode("sayHello", "UTF-8"); - data += "&" + URLEncoder.encode("c0-id", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8"); - data += "&" + URLEncoder.encode("c0-param0", "UTF-8") + "=" + URLEncoder.encode("string:petra", "UTF-8"); - data += "&" + URLEncoder.encode("batchId", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8"); - - wr.write(data); - wr.flush(); - - BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream())); - rd.readLine(); // throw 'allowScriptTagRemoting is false.'; - rd.readLine(); //#DWR-INSERT - rd.readLine(); //#DWR-REPLY - String line = rd.readLine(); // dwr.engine._remoteHandleCallback('0','0',"Hello petra"); - wr.close(); - rd.close(); - - assertTrue(line.endsWith("\"Hello petra\");")); - - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/pom.xml deleted file mode 100644 index 6f2b820e4c..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-jsf-webapp - Apache Tuscany SCA Sample Helloworld JSF - war - - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - compile - - - - org.apache.tuscany.sca - tuscany-implementation-web-runtime - 2.0-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-myfaces - 2.0-SNAPSHOT - runtime - - - - - - helloworld-jsf - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-jsf - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java deleted file mode 100644 index 9c9f541997..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java +++ /dev/null @@ -1,56 +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 org.oasisopen.sca.annotation.Reference; - -/** - * - */ -public class HelloWorldController { - - @Reference - protected HelloworldService service; - - private String name; - - public HelloWorldController() { - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - /** - * Method that is backed to a submit button of a form. - */ - public String send() { - if (service == null) { - name = "reference not injected!"; - } else { - name = service.sayHello(name); - } - return "success"; - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/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/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 23925d6c69..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/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/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index 99cee9faeb..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - helloWorld - sample.HelloWorldController - request - - - - - /helloWorld.jsp - - success - /page2.jsp - - - - - - /page2.jsp - - back - /helloWorld.jsp - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index fecbd7c79b..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - MyProject web.xml - - - - org.apache.tuscany.sca.host.webapp.TuscanyContextListener - - - org.apache.myfaces.config.annotation.LifecycleProvider - org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider - - - - - State saving method: "client" or "server" (= default) - See JSF Specification 2.5.3 - javax.faces.STATE_SAVING_METHOD - client - - - Only applicable if state saving method is "server" (= default). - Defines the amount (default = 20) of the latest views are stored in session. - org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION - 20 - - - Only applicable if state saving method is "server" (= default). - If true (default) the state will be serialized to a byte stream before it - is written to the session. - If false the state will not be serialized to a byte stream. - org.apache.myfaces.SERIALIZE_STATE_IN_SESSION - true - - - Only applicable if state saving method is "server" (= default) and if - org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default) - If true (default) the serialized state will be compressed before it - is written to the session. If false the state will not be compressed. - org.apache.myfaces.COMPRESS_STATE_IN_SESSION - true - - - This parameter tells MyFaces if javascript code should be allowed in the - rendered HTML output. - If javascript is allowed, command_link anchors will have javascript code - that submits the corresponding form. - If javascript is not allowed, the state saving info and nested parameters - will be added as url parameters. - Default: "true" - org.apache.myfaces.ALLOW_JAVASCRIPT - true - - - org.apache.myfaces.DETECT_JAVASCRIPT - false - - - If true, rendered HTML code will be formatted, so that it is "human readable". - i.e. additional line separators and whitespace will be written, that do not - influence the HTML code. - Default: "true" - org.apache.myfaces.PRETTY_HTML - true - - - If true, a javascript function will be rendered that is able to restore the - former vertical scroll on every request. Convenient feature if you have pages - with long lists and you do not want the browser page to always jump to the top - if you trigger a link or button action that stays on the same page. - Default: "false" - org.apache.myfaces.AUTO_SCROLL - true - - - - Used for encrypting view state. Only relevant for client side - state saving. See MyFaces wiki/web site documentation for instructions - on how to configure an application for diffenent encryption strengths. - - org.apache.myfaces.SECRET - NzY1NDMyMTA= - - - - - Validate managed beans, navigation rules and ensure that forms are not nested. - - org.apache.myfaces.VALIDATE - true - - - - - Treat readonly same as if disabled attribute was set for select elements. - - org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS - true - - - - - Use the defined class as the class which will be called when a resource is added to the - ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add - custom components and want to use the ExtensionFilter, you need to provide your custom implementation here. - - org.apache.myfaces.ADD_RESOURCE_CLASS - org.apache.myfaces.renderkit.html.util.DefaultAddResource - - - - - Virtual path in the URL which triggers loading of resources for the MyFaces extended components - in the ExtensionFilter. - - org.apache.myfaces.RESOURCE_VIRTUAL_PATH - /faces/myFacesExtensionResource - - - - - Check if the extensions-filter has been properly configured. - - org.apache.myfaces.CHECK_EXTENSIONS_FILTER - true - - - - - Define partial state saving as true/false. - - javax.faces.PARTIAL_STATE_SAVING_METHOD - false - - - - - org.apache.myfaces.webapp.StartupServletContextListener - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - - Faces Servlet - *.jsf - - - - - index.jsp - index.html - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp deleted file mode 100644 index 189c142c99..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp +++ /dev/null @@ -1,40 +0,0 @@ - - -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> - - - - Apache Tuscany Helloworld JSF sample - - -

Apache Tuscany Helloworld JSF sample

- - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/index.jsp deleted file mode 100644 index 5ca296e115..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/index.jsp +++ /dev/null @@ -1,23 +0,0 @@ - - -<%@ page session="false"%> -<% -response.sendRedirect("helloWorld.jsf"); -%> diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/page2.jsp deleted file mode 100644 index 89259021c7..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsf/src/main/webapp/page2.jsp +++ /dev/null @@ -1,38 +0,0 @@ - - -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> - - - Apache Tuscany Helloworld JSF sample - - -

Apache Tuscany Helloworld JSF sample

- - - -
- - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/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/trunk/samples/getting-started/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/pom.xml deleted file mode 100644 index 05a3e23895..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/pom.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-jsp-webapp - war - Apache Tuscany SCA Sample Helloworld JSP - - - - - org.apache.tuscany.sca.shades - tuscany-base - 2.0-SNAPSHOT - - - - junit - junit - 4.8.1 - test - - - - net.sourceforge.htmlunit - htmlunit - 2.6 - test - - - - - - helloworld-jsp - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-jsp - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/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/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index a22c095f29..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index fa1f7ad7b9..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Apache Tuscany Helloworld JSP Sample - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - - hello.jsp - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/hello.jsp deleted file mode 100644 index ffd01cca73..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,37 +0,0 @@ - - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %> - - - - - - -

Apache Tuscany Helloworld JSP Sample

- - Calling HelloworldService sayHello("world") returns: - -

- - <%= service.sayHello("world") %> - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 665957b0eb..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,53 +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.assertEquals; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Iterator; - -import org.junit.Test; - -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlParagraph; - -/** - */ -public class HelloworldTestCase { - - @Test - public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { - HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp"); - Iterator ss = page.getAllHtmlChildElements().iterator(); - while(ss.hasNext()) { - HtmlElement htmlElement = (HtmlElement) ss.next(); - if( htmlElement instanceof HtmlParagraph) { - assertEquals("Hello world", htmlElement.asText()); - break; - } - } - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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/trunk/samples/getting-started/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/pom.xml deleted file mode 100644 index 45725aaf72..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-servlet-webapp - war - Apache Tuscany SCA Sample Helloworld Servlet - - - - - org.apache.tuscany.sca.shades - tuscany-base-nodep - 2.0-SNAPSHOT - - - - 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/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 2e43e09897..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 9e79276704..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java deleted file mode 100644 index bb72c50f6a..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index a91b3fc96b..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/main/webapp/hello.html deleted file mode 100644 index c4484916aa..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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/trunk/samples/getting-started/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 61d722da1f..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/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")); - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/pom.xml deleted file mode 100644 index 16259aba62..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-stripes-webapp - war - Apache Tuscany SCA Sample Helloworld using Stripes - - - - - - org.apache.tuscany.sca.shades - tuscany-base - 2.0-SNAPSHOT - - - - - net.sourceforge.stripes - stripes - 1.5.2 - - - - taglibs - standard - 1.1.2 - - - - junit - junit - 4.8.1 - test - - - - net.sourceforge.htmlunit - htmlunit - 2.6 - test - - - - - - helloworld-stripes - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld-stripes - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java deleted file mode 100644 index 0ab02682ac..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java +++ /dev/null @@ -1,33 +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 mystripes.action; - -import net.sourceforge.stripes.action.ActionBean; -import net.sourceforge.stripes.action.ActionBeanContext; - -public class BaseActionBean implements ActionBean { - private ActionBeanContext context; - - public ActionBeanContext getContext() { - return context; - } - public void setContext(ActionBeanContext context) { - this.context = context; - } -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java deleted file mode 100644 index 0385c92369..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java +++ /dev/null @@ -1,45 +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 mystripes.action; - -import net.sourceforge.stripes.action.DefaultHandler; -import net.sourceforge.stripes.action.ForwardResolution; -import net.sourceforge.stripes.action.Resolution; -import net.sourceforge.stripes.action.UrlBinding; - -import org.oasisopen.sca.annotation.Reference; - -import sample.HelloworldService; - -@UrlBinding("/Home.htm") -public class HomeActionBean extends BaseActionBean { - - @Reference - HelloworldService service; - - @DefaultHandler - public Resolution view() { - return new ForwardResolution("/WEB-INF/jsp/home.jsp"); - } - - public String getHello() { - return service.sayHello("world"); - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/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/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index a22c095f29..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/StripesResources.properties deleted file mode 100644 index 902842a19e..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/StripesResources.properties +++ /dev/null @@ -1,73 +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. -# - -# Resource strings used by the tag when there are no nested tags -stripes.errors.header=
Please fix the following errors:
    -stripes.errors.beforeError=
  1. -stripes.errors.afterError=
    2. -stripes.errors.footer=
- -# Resource strings used by the tag when displaying errors for a -# specific field (e.g. ). If not supplied the -# values above will be used instead. -stripes.fieldErrors.header= -stripes.fieldErrors.beforeError= -stripes.fieldErrors.afterError=
-stripes.fieldErrors.footer= - -# Resource strings used by the stripes:messages tag -stripes.messages.header=
    -stripes.messages.beforeMessage=
  • -stripes.messages.afterMessage=
    • -stripes.messages.footer=
- -# Validation error messages produced by Stripes' built-in converter classes. These -# are default error messages and can be overridden on per-field and per-form levels. -# Using the 'invalidNumber' error for a field 'age' of a form posting to -# '/user/Profile.action', the keys looked for (in order) would be: -# 1: /user/Profile.action.age.invalidNumber -# 2: /user/Profile.action.age.errorMessage -# 3: age.errorMessage -# 4: /user/Profile.action.invalidNumber -# 5: converter.number.invalidNumber -converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number -converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0} -converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date -converter.email.invalidEmail=The value ({1}) entered is not a valid email address -converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number - -# Validation error messages produced by Stripes' annotation based validations. These -# are default error messages and can be overridden on per-field and per-form levels. -# Using the 'valueNotPresent' required field error for a field 'username' of a form -# posting to '/user/Register.action', the keys looked for (in order) would be: -# 1: /user/Register.action.username.valueNotPresent -# 2: /user/Register.action.username.errorMessage -# 3: username.errorMessage -# 4: /user/Register.action.valueNotPresent -# 5: validation.required.valueNotPresent -validation.required.valueNotPresent={0} is a required field -validation.minlength.valueTooShort={0} must be at least {2} characters long -validation.maxlength.valueTooLong={0} must be no more than {2} characters long -validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2} -validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2} -validation.mask.valueDoesNotMatch={1} is not a valid {0} -validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid -validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/log4j.properties deleted file mode 100644 index 2741999098..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/resources/log4j.properties +++ /dev/null @@ -1,48 +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. -# - -# log4j.properties - -# Set up a logger to the console -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n - -# Use this to only see log messages beyond a certain threshold in the console -#log4j.appender.stdout.Threshold=WARN - -# Set up a logger to a log file -log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n -log4j.appender.logfile.File=${user.home}/stripesquick.log -log4j.appender.logfile.DatePattern='.'yyyy-MM-dd - -# Use this to only see log messages beyond a certain threshold in the log file -#log4j.appender.logfile.Threshold=WARN - -# Logger settings -log4j.rootLogger=INFO, stdout, logfile - -# Valid levels are TRACE, DEBUG, INFO, WARN, ERROR, FATAL -# Change to TRACE or DEBUG to see more log messages -log4j.logger.net.sourceforge.stripes=WARN -log4j.logger.org.stripesbook.quickstart=INFO -log4j.logger.org.mortbay.log=INFO -log4j.logger.org=WARN -log4j.logger.com=WARN -log4j.logger.net=WARN diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp deleted file mode 100644 index 0681c1f2bf..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp +++ /dev/null @@ -1,26 +0,0 @@ - -<%@ include file="/WEB-INF/jsp/taglibs.jsp" %> - - - -

sayHello returns: ${actionBean.hello}

-

Congratulations, you've set up a Stripes SCA project!

- - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp deleted file mode 100644 index d0fb716b80..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp +++ /dev/null @@ -1,39 +0,0 @@ - -<%@ include file="/WEB-INF/jsp/taglibs.jsp" %> - - - - - - - ${title} - - - - - -
- - -
- - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp deleted file mode 100644 index f85602fcfa..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp +++ /dev/null @@ -1,29 +0,0 @@ - -<%-- Stripes TLD --%> -<%@ taglib prefix="s" uri="http://stripes.sourceforge.net/stripes.tld" %> -<%@ taglib prefix="sdyn" uri="http://stripes.sourceforge.net/stripes-dynattr.tld" %> - -<%-- JSTL TLDs --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - -<%-- This is so that you can conveniently refer to the context path with ${contextPath} --%> - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index f01584cc2f..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Apache Tuscany Helloworld Stripes Sample - - - org.apache.tuscany.sca.host.webapp.TuscanyContextListener - - - - StripesFilter - net.sourceforge.stripes.controller.StripesFilter - - ActionResolver.Packages - mystripes.action - - - Extension.Packages - org.apache.tuscany.sca.stripes - - - - - DispatcherServlet - net.sourceforge.stripes.controller.DispatcherServlet - 1 - - - - StripesFilter - DispatcherServlet - REQUEST - FORWARD - - - - DispatcherServlet - *.htm - - - - index.html - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/index.html deleted file mode 100644 index c79d29e6a5..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/main/webapp/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/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/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 7f4359fa43..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,53 +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.assertEquals; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Iterator; - -import org.junit.Test; - -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlParagraph; - -/** - */ -public class HelloworldTestCase { - - @Test - public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { - HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-stripes"); - Iterator ss = page.getAllHtmlChildElements().iterator(); - while(ss.hasNext()) { - HtmlElement htmlElement = (HtmlElement) ss.next(); - if( htmlElement instanceof HtmlParagraph) { - assertEquals("sayHello returns: Hello world", htmlElement.asText()); - break; - } - } - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/pom.xml deleted file mode 100644 index f715c8eb23..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../pom.xml - - tuscany-samples-getting-started-webapps - pom - Apache Tuscany SCA Getting Started Sample Web Applications - - - - default - - true - - - helloworld - helloworld-bpel - helloworld-jaxrs - helloworld-jms - helloworld-js-client - helloworld-jsf - helloworld-jsp - helloworld-servlet - helloworld-spring - helloworld-stripes - - - - -- cgit v1.2.3