From d1a96a1d9f189ec86d51fc9e4a315879b35be1d0 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 31 Jul 2009 10:49:22 +0000
Subject: Rename 2.0 M3 final RC tag

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799570 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tomcat/testing/download-tomcat/build.xml       | 55 ++++++++++++++++++++
 .../tomcat/testing/download-tomcat/pom.xml         | 60 ++++++++++++++++++++++
 .../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 ++++++++++
 .../sca/2.0-M3/distribution/tomcat/testing/pom.xml | 38 ++++++++++++++
 13 files changed, 481 insertions(+)
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/build.xml
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/pom.xml
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
 create mode 100644 tags/java/sca/2.0-M3/distribution/tomcat/testing/pom.xml

(limited to 'tags/java/sca/2.0-M3/distribution/tomcat/testing')

diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/build.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/build.xml
new file mode 100644
index 0000000000..18df3a6c68
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/build.xml
@@ -0,0 +1,55 @@
+<?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 name="getTomcat">
+
+    <property name="download.location" value="${basedir}/download"/>
+    <property name="downloaded.name" value="${download.location}/apache-tomcat-${tomcat.version}.zip"/>
+
+    <property name="unzip.location" value="${basedir}/target"/>
+    <property name="unzipped.name" value="${unzip.location}/apache-tomcat-${tomcat.version}"/>
+
+    <target name="check-downloaded">
+        <condition property="already.downloaded" >
+            <available file="${downloaded.name}"/>
+        </condition>
+    </target>
+
+    <target name="check-unziped">
+        <condition property="already.unziped" >
+            <available file="${unzipped.name}"/>
+        </condition>
+    </target>
+
+    <target name="download" depends="check-downloaded" unless="already.unziped">
+        <mkdir dir="${download.location}"/>
+        <get src="http://www.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip"
+            dest="${downloaded.name}"
+            verbose="true"
+            usetimestamp="true"/>
+    </target>
+
+    <target name="unzip-files" depends="download" unless="already.unziped">
+        <unzip src="${downloaded.name}"
+               dest="${unzip.location}"
+               overwrite="false">
+        </unzip>
+    </target>
+
+</project>
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/pom.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/pom.xml
new file mode 100644
index 0000000000..f40474aa30
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/download-tomcat/pom.xml
@@ -0,0 +1,60 @@
+<?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-M3</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>download-tomcat</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Tomcat Integration Testing Download Tomcat</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution> 
+                        <id>download-tomcat</id>                       
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build.xml" target="unzip-files">
+                                    <property name="tomcat.version" value="6.0.18"/>
+                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin> 
+        </plugins>
+   </build>
+
+</project>
+
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
new file mode 100644
index 0000000000..4f0771bd08
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
@@ -0,0 +1,47 @@
+<?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-M3</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>helloworld-client-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Client Webapp</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-M3</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+
+</project>
+
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
new file mode 100644
index 0000000000..5815274774
--- /dev/null
+++ b/tags/java/sca/2.0-M3/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/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..f8c7f026b2
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,30 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://testing"
+           name="jsp-client-webapp">
+
+     <!-- TODO: should the component name be unique in the domain? i guess so -->
+    <component name="WebComponent">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..f2e3441d5e
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,31 @@
+<?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>jsp-client-webapp</display-name>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>hello.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
new file mode 100644
index 0000000000..d520375993
--- /dev/null
+++ b/tags/java/sca/2.0-M3/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" %>
+
+<sca:reference name="service" type="testing.HelloworldService" />
+
+<html>
+  <body >
+
+    <h2>jsp-client-webapp</h2>
+
+    Calling HelloworldService sayHello("world") returns:
+
+    <p>
+
+    <%= service.sayHello("world") %>
+
+  </body>
+</html>
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
new file mode 100644
index 0000000000..03968f048b
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
@@ -0,0 +1,45 @@
+<?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-M3</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>helloworld-service-contribution</artifactId>
+    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Service Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-M3</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+</project>
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
new file mode 100644
index 0000000000..f59c31f481
--- /dev/null
+++ b/tags/java/sca/2.0-M3/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/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
new file mode 100644
index 0000000000..be529d36e7
--- /dev/null
+++ b/tags/java/sca/2.0-M3/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/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..f39e321376
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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">
+   <deployable composite="testing:helloworld-service-contribution"/>
+</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..5b4279d9cc
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
@@ -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.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://org.apache.tuscany.tomcat.testing"
+           name="helloworld-service-contribution">
+
+    <component name="HelloworldComponent">
+        <implementation.java class="testing.HelloworldImpl"/>
+    </component>
+
+</composite>
diff --git a/tags/java/sca/2.0-M3/distribution/tomcat/testing/pom.xml b/tags/java/sca/2.0-M3/distribution/tomcat/testing/pom.xml
new file mode 100644
index 0000000000..a377c92c1e
--- /dev/null
+++ b/tags/java/sca/2.0-M3/distribution/tomcat/testing/pom.xml
@@ -0,0 +1,38 @@
+<?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</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>2.0-M3</version>
+    </parent>
+    <groupId>org.apache.tuscany.sca</groupId>
+    <artifactId>tuscany-distribution-tomcat-testing</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Distribution Tomcat Testing</name>
+
+    <modules>
+        <module>helloworld-service-contribution</module>
+        <module>helloworld-client-webapp</module>
+    </modules>
+
+</project>
-- 
cgit v1.2.3