Copy 1.x trunk to branches for start of 1.6 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@892786 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 318 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
new file mode 100644
index 0000000000..c24a741ee2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
@@ -0,0 +1,37 @@
+/*
+ * 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 helloworld;
+
+/**
+ * The HelloWorld client implementation
+ */
+public class HelloWorldClient implements HelloWorldService {
+   
+    HelloWorldService helloWorldRef;
+
+    public String sayHello(String name) {
+        System.out.println("HelloWorldClient.sayHello " + name);
+        return helloWorldRef.sayHello(name);
+    }
+
+    public void setHelloWorldRef(HelloWorldService helloWorldRef) {
+        System.out.println("HelloWorldClient .setHelloWorldService " + helloWorldRef);        
+        this.helloWorldRef = helloWorldRef;
+    }
+}
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..2af978b9ce
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,29 @@
+/*
+ * 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 helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for the helloworld service
+ */
+@Remotable
+public interface HelloWorldService {
+    public String sayHello(String name);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..280388f443
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * 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 helloworld;
+
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    public String sayHello(String name) {
+        System.out.println("HelloWorldServiceImpl .sayHello " + name);        
+        return "Hello " + name;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000000..2419887413
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
@@ -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.    
+-->
+
+<Context>
+
+   <Resource name="ConnectionFactory" auth="Container" type="org.apache.activemq.ActiveMQConnectionFactory" description="JMS Connection Factory"
+        factory="org.apache.activemq.jndi.JNDIReferenceFactory" brokerURL="vm://localhost?broker.persistent=false" brokerName="LocalActiveMQBroker"/>
+
+   <Resource name="HelloWorldService" auth="Container" type="org.apache.activemq.command.ActiveMQQueue" description="my Queue"
+        factory="org.apache.activemq.jndi.JNDIReferenceFactory" physicalName="RequestQueue"/>
+
+</Context>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
new file mode 100644
index 0000000000..f6328d156c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
@@ -0,0 +1,39 @@
+<?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"

+           xmlns:sample="http://sample"

+           name="HelloWorld">

+

+    <component name="HelloWorldClient">

+        <implementation.java class="helloworld.HelloWorldClient"/>

+        <reference name="helloWorldRef">

+            <binding.jms uri="jms:HelloWorldService"/>

+        </reference>

+    </component>

+

+    <component name="HelloWorldServiceComponent">

+        <implementation.java class="helloworld.HelloWorldServiceImpl" />

+	    <service name="HelloWorldService">

+            <binding.jms />

+        </service>

+    </component>

+

+</composite>

diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..4ce36a1181
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?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 xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+    <d:environment>
+        <d:moduleId>
+            <d:groupId>org.apache.tuscany.sca</d:groupId>
+            <d:artifactId>sample-helloworld-jms-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
+    </d:environment>
+</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..86710435ae
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,66 @@
+<?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 JMS Web Service 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>

+

+  <!-- Uncomment this to use an appserver thread pool

+  <resource-ref>

+     <res-ref-name>wm/TuscanyWorkManager</res-ref-name>

+     <res-type>commonj.work.WorkManager</res-type>

+     <res-auth>Container</res-auth>

+     <res-sharing-scope>Shareable</res-sharing-scope>

+  </resource-ref>

+  -->

+

+  <!-- Uncomment these to use local jndi name aliases

+  <resource-ref>

+     <res-ref-name>ConnectionFactory</res-ref-name>

+     <res-type>javax.jms.ConnectionFactory</res-type>

+     <res-auth>Container</res-auth>

+     <res-sharing-scope>Shareable</res-sharing-scope>

+  </resource-ref>

+

+  <resource-ref>

+     <res-ref-name>HelloWorldService</res-ref-name>

+     <res-type>javax.jms.Queue</res-type>

+     <res-auth>Container</res-auth>

+     <res-sharing-scope>Shareable</res-sharing-scope>

+  </resource-ref>

+  -->

+  

+</web-app>

diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
new file mode 100644
index 0000000000..bc6ef59a9b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
@@ -0,0 +1,44 @@
+<%--

+ * 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 import="org.apache.tuscany.sca.host.embedded.SCADomain"%>

+<%@ page import="helloworld.HelloWorldService" %>

+

+<%@ page contentType="text/html;charset=UTF-8" language="java" %>

+<%

+   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");

+   HelloWorldService helloWorldService = (HelloWorldService)scaDomain.getService(HelloWorldService.class, "HelloWorldClient");

+%>

+<html>

+<head><title>HelloWorld JMS sample</title></head>

+

+<body>

+

+If this sample is working correctly you should see "Hello World" on the next line...

+<p>

+<%= helloWorldService.sayHello("world") %>

+<p>

+If you do not see "Hello World" on the line above then there has been a problem.

+<p>

+The sample requires JMS resources be manually configured in the server environment, these are:

+a JMS connection factory named "ConnectionFactory", and a destination queues named "HelloWorldService".

+See the sample README file for more information.

+

+</body>

+</html>