summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-12-09 11:34:56 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-12-09 11:34:56 +0000
commit39cc69a1dcfef0f68fd9514f1c6eddfce96164be (patch)
treeff5a4eb2b8d7da0abd5925071c5d7ecdb352e4d4
parentf94038f80a8d43e4e9fcc1ab12e18ed139dd5326 (diff)
Add another SCAClient webapp this time using a servlet and an html page that enables choosing either the service or reference component to invoke
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@888771 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/pom.xml53
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldService.java28
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldServlet.java64
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/META-INF/sca-contribution.xml28
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/hello.html52
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml1
7 files changed, 267 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/pom.xml
new file mode 100644
index 0000000000..fc7d701cbc
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-tomcat-testing</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>helloworld-scaclient2-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+</project>
+
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldService.java
new file mode 100644
index 0000000000..b035a772be
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldService.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 testing;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface HelloworldService {
+
+ String sayHello(String name);
+
+}
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldServlet.java b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/HelloworldServlet.java
new file mode 100644
index 0000000000..012137e933
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/java/testing/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 testing;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URI;
+
+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.NoSuchDomainException;
+import org.oasisopen.sca.NoSuchServiceException;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ */
+public class HelloworldServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ try {
+
+ String component = request.getParameter("component");
+ HelloworldService service = SCAClientFactory.newInstance(URI.create("vm:default")).getService(HelloworldService.class, component);
+
+ String name = request.getParameter("name");
+ String greeting = service.sayHello(name);
+
+ Writer out = response.getWriter();
+ out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample</title></head><body>");
+ out.write("<h2>Apache Tuscany Helloworld Servlet Sample</h2>");
+ out.write("<br><strong>Component " + component + " says: </strong>" + greeting);
+ out.write("</body></html>");
+ out.flush();
+ out.close();
+
+ } catch (NoSuchDomainException e) {
+ e.printStackTrace();
+ } catch (NoSuchServiceException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..2ab1d68888
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:testing="http://org.apache.tuscany.tomcat.testing">
+
+ <!-- TODO: There's nothing in here as this file is only present so that the
+ Tuscany Tomcat integration code gets triggered when this webapp
+ ias deployed and adds Tuscany to the Webapp classpath so that the
+ SCAClient implementation is available -->
+
+</contribution>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..d424d4b71b
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+ <display-name>helloworld-scaclient2-webapp</display-name>
+
+ <servlet>
+ <servlet-name>HelloworldServlet</servlet-name>
+ <servlet-class>testing.HelloworldServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HelloworldServlet</servlet-name>
+ <url-pattern>/HelloworldServlet</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>hello.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/hello.html b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/hello.html
new file mode 100644
index 0000000000..bd20d95f28
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient2-webapp/src/main/webapp/hello.html
@@ -0,0 +1,52 @@
+<!--
+ * 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.
+-->
+<html>
+
+<head>
+<title>helloworld-scaclient2-webapp</title>
+</head>
+
+<body>
+
+<h2>helloworld-scaclient2-webapp</h2>
+
+<form action="HelloworldServlet" method="post">
+ <table>
+ <tr>
+
+ <td><select name="component" size="1">
+ <option>HelloworldComponent</option>
+ <option>HelloworldRefComponent</option>
+ </select></td>
+
+ <td>Enter your name:</td>
+ <td>
+ <input type="text" name="name" width="10">
+ </td>
+ </tr>
+ <tr>
+ <td align="left" colspan="2">
+ <button name="submit" type="submit">Say hello</button>
+ </td>
+ </tr>
+ </table>
+</form>
+
+</body>
+</html> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml
index 705cdf41b2..0c8151e83f 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml
@@ -34,6 +34,7 @@
<module>helloworld-service-contribution</module>
<module>helloworld-reference-contribution</module>
<module>helloworld-scaclient-webapp</module>
+ <module>helloworld-scaclient2-webapp</module>
<module>helloworld-client-webapp</module>
<module>legal-checks</module>
</modules>