From 904dfab75e47aaa12610ecdf2a26ea266d8069f1 Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 15 Apr 2009 14:47:05 +0000 Subject: Separate the contribution JEE sample scenarios from the contribution JEE itests so we can see the source for the samples and more easily mix and match to construct the various combinations required. Add a new test relating to a single sample scenario to explore the problem with classloading where the JEE archive classloader is not available during contribution resolution. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@765218 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/contribution-jee-samples/pom.xml | 46 ++++++++++++ .../war-appcomp-contrib-implicit/pom.xml | 66 +++++++++++++++++ .../src/main/java/sample/HelloworldEjbServlet.java | 66 +++++++++++++++++ .../main/java/sample/ejb3/HelloworldService.java | 33 +++++++++ .../src/main/webapp/WEB-INF/geronimo-web.xml | 49 ++++++++++++ .../src/main/webapp/WEB-INF/web.composite | 32 ++++++++ .../src/main/webapp/WEB-INF/web.xml | 41 +++++++++++ .../src/main/webapp/hello.html | 50 +++++++++++++ .../sca-java-1.x/itest/contribution-jee/pom.xml | 7 ++ .../jee/WARAppcompContribImplicitTestCase.java | 86 ++++++++++++++++++++++ 10 files changed, 476 insertions(+) create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml create mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html create mode 100644 branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml new file mode 100644 index 0000000000..95bece2485 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml @@ -0,0 +1,46 @@ + + + + 4.0.0 + + + org.apache.tuscany.sca + tuscany-itest + 1.5-SNAPSHOT + ../pom.xml + + + itest-contribution-jee-samples + Apache Tuscany SCA iTest Contribution Java EE Samples + + pom + + + + default + + true + + + war-appcomp-contrib-implicit + + + + diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml new file mode 100644 index 0000000000..791b24b01e --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml @@ -0,0 +1,66 @@ + + + + + 4.0.0 + + org.apache.tuscany.sca + itest-contribution-jee-samples + 1.5-SNAPSHOT + ../pom.xml + + + itest-contribution-jee-samples-6 + Apache Tuscany SCA iTest Contribution Java EE Samples 6 + war + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5-SNAPSHOT + provided + + + + javax.servlet + servlet-api + 2.5 + provided + + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + 1.0 + provided + + + + + + + org.apache.maven.plugins + maven-war-plugin + + + ${artifactId} + + diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java new file mode 100644 index 0000000000..ae8613f8db --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java @@ -0,0 +1,66 @@ +/* + * 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.ejb.EJB; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; + +/** + * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB. + * + * @version $Rev$ $Date$ + */ +public class HelloworldEjbServlet extends HttpServlet { + private static final long serialVersionUID = -4448818871934180718L; + + @EJB + private HelloworldService service; + + @Reference + protected HelloworldService helloworldSca; + + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { + String name = request.getParameter("name"); + String greeting = service.getGreetings(name); + String greeting2 = helloworldSca.getGreetings(name.toUpperCase()); + + Writer out = response.getWriter(); + out.write("Apache Tuscany Helloworld Web Sample"); + out.write("

Apache Tuscany Helloworld Web Sample

"); + out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB."); + out.write("
Parameter sent to HelloworldService.getGreeting: "+name); + out.write(greeting); + out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean"); + out.write("
Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase()); + out.write(greeting2); + out.write(""); + out.flush(); + out.close(); + } +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java new file mode 100644 index 0000000000..0194d1870c --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.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 sample.ejb3; + +import javax.ejb.Remote; + +/** + * HelloworldService EJB interface. + * + * @version $Rev$ $Date$ + */ + +@Remote +public interface HelloworldService { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml new file mode 100644 index 0000000000..2563c8b7c8 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml @@ -0,0 +1,49 @@ + + + + + + test + helloworld-web + 1.0 + car + + + + test + helloworld-ejb + 1.0 + jar + + + + + + helloworld-web + + ejb/HelloworldServiceBean + + test + helloworld-ejb + 1.0 + HelloworldServiceBean + + + \ No newline at end of file diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..29898fe006 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..628588a974 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ + + + + + + + Helloworld Web Sample + + + HelloworldEjbServlet + sample.HelloworldEjbServlet + + + + HelloworldEjbServlet + /HelloworldEjbServlet + + + + hello.html + + + diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html new file mode 100644 index 0000000000..69473543c9 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html @@ -0,0 +1,50 @@ + + + + +Apache Tuscany Helloworld Web Sample + + + + +

Apache Tuscany Helloworld Web Sample

+ +This web page posts the data to HelloworldEjbServlet. The servlet invokes HelloworldServiceBean, which is a Stateless EJB. +The EJB in turn invokes Helloworld SCA service through proxies injected into EJB fields. + +

+ +
+ + + + + + + + +
Enter your name: + +
+ +
+
+ + diff --git a/branches/sca-java-1.x/itest/contribution-jee/pom.xml b/branches/sca-java-1.x/itest/contribution-jee/pom.xml index 83f4a220a7..133345ef20 100644 --- a/branches/sca-java-1.x/itest/contribution-jee/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-jee/pom.xml @@ -83,6 +83,12 @@ tuscany-implementation-web-runtime 1.5-SNAPSHOT + + + org.apache.tuscany.sca + itest-contribution-jee-samples + 1.5-SNAPSHOT + org.apache.myfaces.core @@ -95,6 +101,7 @@ myfaces-impl 1.2.3 + org.apache.geronimo.specs geronimo-jsp_2.1_spec diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java new file mode 100644 index 0000000000..7da1bc1a1b --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java @@ -0,0 +1,86 @@ +/* + * 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 org.apache.tuscany.sca.test.contribution.jee; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.jee.JEEImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +public class WARAppcompContribImplicitTestCase { + + private static final String CONTRIBUTION_001_ID = "contribution001/"; + + private ClassLoader cl; + private EmbeddedSCADomain domain; + private ContributionService contributionService; + + /** + * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending + * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and + * to get a reference to the contribution service + */ + + @Before + public void setUp() throws Exception { + //Create a test embedded SCA domain + cl = getClass().getClassLoader(); + domain = new EmbeddedSCADomain(cl, "http://localhost"); + + //Start the domain + domain.start(); + + //get a reference to the contribution service + contributionService = domain.getContributionService(); + } + + /** + * WAR - It's a WAR + * Appcomp - It has an application composite + * Contrib - It's a contribution in it's own right + * Implicit - Composite deployment is implicit + * + */ + @Test + public void testWARAppcompContribImplicit() throws Exception { + URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-6.war").toURL(); + contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); + Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID)); + } + +} -- cgit v1.2.3