summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-2.0-M4/samples/webapps
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/README (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/README)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/README (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/README)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml)0
87 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml
index 70007b6157..70007b6157 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
index 3ffe604ef7..3ffe604ef7 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/README
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml
index 423d68c837..423d68c837 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index 5c52638661..5c52638661 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml
index 53bf9dc2c4..53bf9dc2c4 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index c59c7a8f6d..c59c7a8f6d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml
index dd8dfa5cf3..dd8dfa5cf3 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml
index fe34677fd9..fe34677fd9 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/README b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/README
index 00568d9bb0..00568d9bb0 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/README
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/README
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml
index 5bca84a586..5bca84a586 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
index 8c84b4f372..8c84b4f372 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
index 31ff956185..31ff956185 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
index 7e33b15efc..7e33b15efc 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
index d4441c0ab8..d4441c0ab8 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite
index 7f76f5946d..7f76f5946d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
index 745164bf8d..745164bf8d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
index 9fc16372b3..9fc16372b3 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
index 3a670696e4..3a670696e4 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css
index 0f1cea3aaf..0f1cea3aaf 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite
index 70b83fd986..70b83fd986 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml
index bae9ec6b53..bae9ec6b53 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml
index 7bfd9dd6c4..7bfd9dd6c4 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml
index dee97a5ad1..dee97a5ad1 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
index 61eb207e23..61eb207e23 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
index 061f4c58ae..061f4c58ae 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
index fdd91b0933..fdd91b0933 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
index e7d864c5e6..e7d864c5e6 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
index 85f2c00dbc..85f2c00dbc 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
index 1e24577860..1e24577860 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
index a52d6b6cbe..a52d6b6cbe 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
index 3783b7bf82..3783b7bf82 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml
index 72b476041b..72b476041b 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
index 8d220029a5..8d220029a5 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
index 045aa4674f..045aa4674f 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index d7b237641c..d7b237641c 100644
--- a/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml