From 42434c2fbec206b1f4160183ba3f8e0784827c86 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 29 May 2009 14:03:21 +0000 Subject: Start adding some testing modules for the tomcat integration git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779980 13f79535-47bb-0310-9956-ffa450edef68 --- .../testing/helloworld-client-webapp/pom.xml | 47 ++++++++++++++++++++++ .../src/main/java/testing/HelloworldService.java | 27 +++++++++++++ .../src/main/webapp/WEB-INF/web.composite | 30 ++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 31 ++++++++++++++ .../src/main/webapp/hello.jsp | 36 +++++++++++++++++ .../helloworld-service-contribution/pom.xml | 45 +++++++++++++++++++++ .../src/main/java/testing/HelloworldImpl.java | 36 +++++++++++++++++ .../src/main/java/testing/HelloworldService.java | 25 ++++++++++++ .../main/resources/META-INF/sca-contribution.xml | 23 +++++++++++ .../src/main/resources/helloworld.composite | 28 +++++++++++++ java/sca/distribution/tomcat/testing/pom.xml | 38 +++++++++++++++++ 11 files changed, 366 insertions(+) create mode 100644 java/sca/distribution/tomcat/testing/helloworld-client-webapp/pom.xml create mode 100644 java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java create mode 100644 java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite create mode 100644 java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml create mode 100644 java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp create mode 100644 java/sca/distribution/tomcat/testing/helloworld-service-contribution/pom.xml create mode 100644 java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java create mode 100644 java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java create mode 100644 java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml create mode 100644 java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite create mode 100644 java/sca/distribution/tomcat/testing/pom.xml (limited to 'java') diff --git a/java/sca/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/pom.xml new file mode 100644 index 0000000000..f5057b08f7 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-distribution-tomcat-testing + 2.0-SNAPSHOT + ../pom.xml + + + helloworld-client-webapp + war + Apache Tuscany SCA Tomcat Integration Testing Helloworld Client Webapp + + + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-SNAPSHOT + provided + + + + + ${artifactId} + + + + diff --git a/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java new file mode 100644 index 0000000000..5815274774 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.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 testing; + +// TODO: should the webapp need to include the service interface? + +public interface HelloworldService { + + String sayHello(String name); + +} diff --git a/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite new file mode 100644 index 0000000000..f8c7f026b2 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..f2e3441d5e --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,31 @@ + + + + + jsp-client-webapp + + + hello.jsp + + + diff --git a/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp new file mode 100644 index 0000000000..d520375993 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp @@ -0,0 +1,36 @@ +<%-- + * 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" %> + + + + + + +

jsp-client-webapp

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

+ + <%= service.sayHello("world") %> + + + diff --git a/java/sca/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/pom.xml new file mode 100644 index 0000000000..21f5fecfd7 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/pom.xml @@ -0,0 +1,45 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-distribution-tomcat-testing + 2.0-SNAPSHOT + ../pom.xml + + + helloworld-service-contribution + Apache Tuscany SCA Tomcat Integration Testing Helloworld Service Contribution + + + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-SNAPSHOT + provided + + + + + + ${artifactId} + + diff --git a/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java new file mode 100644 index 0000000000..f59c31f481 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java @@ -0,0 +1,36 @@ +/* + * 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 testing; + +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.EagerInit; + +@Scope("COMPOSITE") @EagerInit +public class HelloworldImpl implements HelloworldService { + + public String sayHello(String name) { + return "Hello " + name; + } + + @Init + public void init() { + System.out.println("HelloworldImpl eager init: " + sayHello("world")); + } +} diff --git a/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java new file mode 100644 index 0000000000..be529d36e7 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/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 testing; + +public interface HelloworldService { + + String sayHello(String name); + +} diff --git a/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..f39e321376 --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..5b4279d9cc --- /dev/null +++ b/java/sca/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/java/sca/distribution/tomcat/testing/pom.xml b/java/sca/distribution/tomcat/testing/pom.xml new file mode 100644 index 0000000000..c2e4ac197f --- /dev/null +++ b/java/sca/distribution/tomcat/testing/pom.xml @@ -0,0 +1,38 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-distribution-tomcat + ../pom.xml + 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-distribution-tomcat-testing + pom + Apache Tuscany SCA Distribution Tomcat Testing + + + helloworld-service-contribution + helloworld-client-webapp + + + -- cgit v1.2.3