From d5f1d093fe6fa491cdec392dca7137639e98d149 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 15 Sep 2008 00:26:00 +0000
Subject: Pulled a recent revision of trunk into the sca-android branch, to
 apply the android patches from JIRA TUSCANY-2440 to it.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68
---
 .../helloworld-webapp/README                       |  28 +++++
 .../helloworld-webapp/build.xml                    | 128 +++++++++++++++++++++
 .../helloworld-webapp/pom.xml                      |  78 +++++++++++++
 .../src/main/java/sample/Helloworld.java           |  27 +++++
 .../src/main/webapp/WEB-INF/web.composite          |  29 +++++
 .../src/main/webapp/WEB-INF/web.xml                |  41 +++++++
 .../helloworld-webapp/src/main/webapp/hello.jsp    |  36 ++++++
 7 files changed, 367 insertions(+)
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp

(limited to 'branches/sca-android/samples/helloworld-distributed/helloworld-webapp')

diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README
new file mode 100644
index 0000000000..0ea891b07f
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README
@@ -0,0 +1,28 @@
+Distributed Helloworld Sample
+=============================
+
+This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which
+automatically discovers available nodes and the services they contain.
+
+In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,
+and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.
+
+To run the sample:
+
+- Build the two sample modules with mvn or Ant.
+- Deploy the helloworld-webapp war to Tomcat. 
+- Start the standalone node by:
+  in the helloworld-node folder do "mvn dependency:copy-dependencies" then:
+  java -Djava.ext.dirs=target\dependency -cp target\sample-helloworld-node.jar sample.HelloworldNode
+- On a web browser go to:
+  http://localhost:8080/sample-helloworld-webapp
+
+You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"
+
+How it works:
+
+
+
+
+ 
+
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml
new file mode 100644
index 0000000000..e08dd3027a
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml
@@ -0,0 +1,128 @@
+<!--
+ * 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 name="sample-helloworld-webapp" default="compile">
+
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+            <src path="src\main\java"/>
+            <classpath>
+                <fileset refid="tuscany.jars"/>
+                <fileset refid="3rdparty.jars"/>
+            </classpath>
+        </javac>
+        <copy todir="target/classes">
+            <fileset dir="src\main\resources"/>
+            <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
+        </copy>
+        <war destfile="target/sample-helloworld-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
+            <fileset dir="src/main/webapp"/>
+            <lib refid="tuscany.jars"/>
+            <lib refid="3rdparty.jars"/>
+            <classes dir="target/classes"/>
+        </war>
+    </target>
+
+    <target name="package" depends="compile"/>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+    <fileset id="tuscany.jars" dir="../../modules">
+        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jms-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jms-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-jms-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-web-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-web-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
+    </fileset>
+    <fileset id="3rdparty.jars" dir="../../lib">
+        <include name="XmlSchema-1.3.2.jar"/>
+        <include name="activation-1.1.jar"/>
+        <include name="activeio-core-3.1.0-tests.jar"/>
+        <include name="activeio-core-3.1.0.jar"/>
+        <include name="activemq-core-5.1.0.jar"/>
+        <include name="asm-all-3.1.jar"/>
+        <include name="avalon-framework-4.1.3.jar"/>
+        <include name="axiom-api-1.2.5.jar"/>
+        <include name="axiom-impl-1.2.5.jar"/>
+        <include name="backport-util-concurrent-2.1.jar"/>
+        <include name="camel-core-1.3.0.jar"/>
+        <include name="cglib-nodep-2.1_3.jar"/>
+        <include name="commons-logging-1.1.jar"/>
+        <include name="commons-logging-api-1.1.jar"/>
+        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+        <include name="geronimo-j2ee-management_1.0_spec-1.0.jar"/>
+        <include name="geronimo-jms_1.1_spec-1.1.1.jar"/>
+        <include name="jaxb-api-2.1.jar"/>
+        <include name="jaxb-impl-2.1.3.jar"/>
+        <include name="jaxen-1.1-beta-9.jar"/>
+        <include name="jaxws-api-2.1.jar"/>
+        <include name="jsr181-api-1.0-MR1.jar"/>
+        <include name="jsr250-api-1.0.jar"/>
+        <include name="log4j-1.2.12.jar"/>
+        <include name="logkit-1.0.1.jar"/>
+        <include name="mail-1.4.jar"/>
+        <include name="servlet-api-2.3.jar"/>
+        <include name="stax-api-1.0-2.jar"/>
+        <include name="wstx-asl-3.2.1.jar"/>
+    </fileset>
+
+</project>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml
new file mode 100644
index 0000000000..ee51fd55db
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml
@@ -0,0 +1,78 @@
+<?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-sca</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-helloworld-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Distributed Helloworld WebApp Sample</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-jms</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.4-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+       </plugins>
+    </build>
+</project>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
new file mode 100644
index 0000000000..7dd39b82a4
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package sample;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Helloworld {
+
+    String sayHello(String name);
+}
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..0e8de1be42
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,29 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://sample"
+           name="Helloworld">
+
+    <component name="foo">
+		<implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent" />
+    </component>
+
+</composite>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..1eefec1c48
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  * 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.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+  <display-name>Apache Tuscany Distributed Helloworld Sample</display-name>
+
+  <filter>
+    <filter-name>tuscany</filter-name> 
+    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
+  </filter>
+
+  <filter-mapping>
+    <filter-name>tuscany</filter-name> 
+    <url-pattern>/*</url-pattern> 
+  </filter-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>hello.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
new file mode 100644
index 0000000000..873329cf7c
--- /dev/null
+++ b/branches/sca-android/samples/helloworld-distributed/helloworld-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" %>
+
+<sca:reference name="service" type="sample.Helloworld" />
+
+<html>
+  <body >
+
+    <h2>Apache Tuscany Distributed Helloworld Sample</h2>
+
+    Calling service.sayHello("world") returns:
+
+    <p>
+
+    <%= service.sayHello("world") %>
+
+  </body>
+</html>
-- 
cgit v1.2.3