From 3fb60e91d2282025ba4a35849afb3a3704c861d9 Mon Sep 17 00:00:00 2001
From: kelvingoodson <kelvingoodson@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 25 Sep 2010 16:35:21 +0000
Subject: TUSCANY-3677 getting-started clearup

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1001260 13f79535-47bb-0310-9956-ffa450edef68
---
 .../webapps/helloworld-spring-webapp/pom.xml       | 186 +++++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml                |  51 ++++++
 .../test/java/sample/HelloworldClientTestCase.java |  58 +++++++
 .../src/test/resources/test-web.xml                |  25 +++
 .../webapps/helloworld-spring/pom.xml              | 186 ---------------------
 .../src/main/webapp/WEB-INF/web.xml                |  51 ------
 .../test/java/sample/HelloworldClientTestCase.java |  58 -------
 .../src/test/resources/test-web.xml                |  25 ---
 8 files changed, 320 insertions(+), 320 deletions(-)
 create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/pom.xml
 create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
 create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/resources/test-web.xml
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/pom.xml
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/java/sample/HelloworldClientTestCase.java
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/resources/test-web.xml

(limited to 'sca-java-2.x/trunk')

diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/pom.xml
new file mode 100644
index 0000000000..59f3a25696
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/pom.xml
@@ -0,0 +1,186 @@
+<?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-samples</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-helloworld-spring-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample Spring Helloworld</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-web20</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>sample-helloworld-spring</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.6.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>helloworld-spring</finalName>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Skip the normal tests, we'll run them in the integration-test phase -->
+                    <skip>true</skip>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Ingore the test failures so that the build will proceed to stop the tomcat server -->
+                            <testFailureIgnore>true</testFailureIgnore>
+                            <skip>false</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>sample-helloworld-spring</artifactId>
+                            <type>jar</type>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <excludes>
+                                <exclude>META-INF/**/*</exclude>
+                            </excludes>
+                        </overlay>
+                        
+                        <overlay>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>sample-helloworld-spring</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>META-INF/**/*</include>
+                            </includes>
+                        </overlay>
+
+                        <overlay>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>tuscany-implementation-spring-webapp</artifactId>
+                            <type>jar</type>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <includes>
+                                <include>org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml</include>
+                            </includes>
+                        </overlay>
+                    </overlays>                        
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.18</version>
+                <configuration>
+                    <contextPath>helloworld</contextPath>
+                    <stopKey>foo</stopKey>
+                    <stopPort>9999</stopPort>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml>
+                            <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+                            <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml>
+                            <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</classesDirectory>                            
+                            <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <daemon>true</daemon>
+                            <connectors>
+                                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                                    <port>8085</port>
+                                </connector>
+                            </connectors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..49590e00a2
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,51 @@
+<?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>Apache Tuscany Helloworld Spring Sample</display-name>
+
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+        /WEB-INF/classes/helloworld-context.xml
+        /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
+        </param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+    
+    <listener>
+        <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
+    </listener>
+
+    <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>
+
+</web-app>
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
new file mode 100644
index 0000000000..fa77f08ee2
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ByteArrayInputStream;
+
+import junit.framework.Assert;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+
+/**
+ * 
+ */
+public class HelloworldClientTestCase {
+    private static final String SERVICE_URL =
+        "http://localhost:8085/helloworld/HelloworldClientComponent/HelloworldClientBean";
+
+    @Test
+    public void testJSONRPCBinding() throws Exception {
+        JSONObject jsonRequest = new JSONObject("{ \"method\": \"sayHello\", \"params\": [\"Ray\"], \"id\": 1}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request =
+            new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),
+                                     "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+        String text = jsonResp.getString("result");
+        Assert.assertTrue(text.endsWith("Hello Ray"));
+    }
+}
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/resources/test-web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/resources/test-web.xml
new file mode 100644
index 0000000000..0ad2ed49c1
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring-webapp/src/test/resources/test-web.xml
@@ -0,0 +1,25 @@
+<?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" >
+
+</web-app>
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/pom.xml
deleted file mode 100644
index 59f3a25696..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-spring-webapp</artifactId>
-    <name>Apache Tuscany SCA Sample Spring Helloworld</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-web20</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>helloworld-spring</finalName>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Skip the normal tests, we'll run them in the integration-test phase -->
-                    <skip>true</skip>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Ingore the test failures so that the build will proceed to stop the tomcat server -->
-                            <testFailureIgnore>true</testFailureIgnore>
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.apache.tuscany.sca</groupId>
-                            <artifactId>sample-helloworld-spring</artifactId>
-                            <type>jar</type>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <excludes>
-                                <exclude>META-INF/**/*</exclude>
-                            </excludes>
-                        </overlay>
-                        
-                        <overlay>
-                            <groupId>org.apache.tuscany.sca</groupId>
-                            <artifactId>sample-helloworld-spring</artifactId>
-                            <type>jar</type>
-                            <includes>
-                                <include>META-INF/**/*</include>
-                            </includes>
-                        </overlay>
-
-                        <overlay>
-                            <groupId>org.apache.tuscany.sca</groupId>
-                            <artifactId>tuscany-implementation-spring-webapp</artifactId>
-                            <type>jar</type>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <includes>
-                                <include>org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml</include>
-                            </includes>
-                        </overlay>
-                    </overlays>                        
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.18</version>
-                <configuration>
-                    <contextPath>helloworld</contextPath>
-                    <stopKey>foo</stopKey>
-                    <stopPort>9999</stopPort>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>start-jetty</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml>
-                            <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
-                            <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml>
-                            <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</classesDirectory>                            
-                            <scanIntervalSeconds>0</scanIntervalSeconds>
-                            <daemon>true</daemon>
-                            <connectors>
-                                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                                    <port>8085</port>
-                                </connector>
-                            </connectors>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop-jetty</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 49590e00a2..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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>Apache Tuscany Helloworld Spring Sample</display-name>
-
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>
-        /WEB-INF/classes/helloworld-context.xml
-        /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
-        </param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-    
-    <listener>
-        <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-
-    <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>
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/java/sample/HelloworldClientTestCase.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/java/sample/HelloworldClientTestCase.java
deleted file mode 100644
index fa77f08ee2..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/java/sample/HelloworldClientTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.ByteArrayInputStream;
-
-import junit.framework.Assert;
-
-import org.json.JSONObject;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-
-/**
- * 
- */
-public class HelloworldClientTestCase {
-    private static final String SERVICE_URL =
-        "http://localhost:8085/helloworld/HelloworldClientComponent/HelloworldClientBean";
-
-    @Test
-    public void testJSONRPCBinding() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"sayHello\", \"params\": [\"Ray\"], \"id\": 1}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request =
-            new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),
-                                     "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-        String text = jsonResp.getString("result");
-        Assert.assertTrue(text.endsWith("Hello Ray"));
-    }
-}
diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/resources/test-web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/resources/test-web.xml
deleted file mode 100644
index 0ad2ed49c1..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-spring/src/test/resources/test-web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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" >
-
-</web-app>
-- 
cgit v1.2.3