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

7 files changed, 329 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/pom.xml
new file mode 100644
index 0000000000..15eaa7f3f3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/pom.xml
@@ -0,0 +1,72 @@
+<?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.    
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-contribution-jee-samples</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-contribution-jee-samples-11-client</artifactId>
+    <name>JEE Integration Samples :: Sample 11 Client</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
new file mode 100644
index 0000000000..43870422c0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
@@ -0,0 +1,72 @@
+/*
+ * 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.servlet.ServletConfig;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osoa.sca.annotations.ComponentName;
+import org.osoa.sca.annotations.Reference;
+
+import sample.ejb3.HelloworldService;
+
+/**
+ * A servlet that invokes Helloworld SCA service through injected references.
+ * 
+ */
+public class HelloworldServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    @Reference(name="service")
+    protected HelloworldService service;
+    
+    @ComponentName
+    protected String scaComponentName;
+
+    @Override
+    public void init(ServletConfig config) {
+        // This method assumes that componentContext is injected.
+    }
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        String name = request.getParameter("name");
+        String greeting0 = service.getGreetings(name);
+        
+        Writer out = response.getWriter();
+        out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample 11 Client</title></head><body>");
+        out.write("<h2>Apache Tuscany Helloworld Servlet Sample 11 Client</h2>");
+        out.write("<h3>SCA Service provided by EJB</h3>");
+        out.write("<br>Reference injected. <br><strong>Result: </strong>" + greeting0);
+        out.write("<hr>");
+        
+        out.write("<h3>@ComponentName</h3>");
+        out.write("<br>Injected into field: "+scaComponentName);
+        out.write("<hr>");
+        out.write("</body></html>");
+        out.flush();
+        out.close();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
new file mode 100644
index 0000000000..73d816311f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+@Remote
+public interface HelloworldService {
+	String getGreetings(String name);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..1f4d7195c0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,33 @@
+<?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.    
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+  <environment>
+    <moduleId>
+      <groupId>test</groupId>
+      <artifactId>itest-contribution-jee-samples-11-client</artifactId>
+      <version>1.0</version>
+      <type>war</type>
+    </moduleId>
+    <dependencies/>
+    <hidden-classes/>
+    <non-overridable-classes/>    
+  </environment>
+  <context-root>/itest-contribution-jee-samples-11-client</context-root>
+</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..b284b201e4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,34 @@
+<?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:xsd="http://www.w3.org/2001/XMLSchema"

+           name="itest-contribution-jee-samples-11-client">

+

+    <component name="sample-11-client">

+        <implementation.web web-uri="itest-contribution-jee-samples-11-client.war"/>

+        <reference name="service" target="HelloworldServiceEJBComponent">

+            <interface.java interface="sample.ejb3.HelloworldService"/>

+            <binding.sca/>

+        </reference>

+    </component>

+</composite>

+

diff --git a/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..1947a53cf0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/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>JEE Samples :: Sample 11 Client</display-name>
+
+  <servlet>
+     <servlet-name>HelloworldServlet</servlet-name>
+     <servlet-class>sample.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-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
new file mode 100644
index 0000000000..bba288b4aa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
@@ -0,0 +1,46 @@
+<!--
+ * 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>Apache Tuscany Helloworld Servlet Sample 11 Client</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Servlet Sample 11 Client</h2>
+
+<form action="HelloworldServlet" method="post">
+    <table>
+        <tr>
+            <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">Submit</button>
+            </td>
+        </tr>
+    </table>
+</form>
+
+</body>
+</html>