From 3c7c4a749baafcf375f4785a7668d3a25c9063e3 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 13 Nov 2009 01:42:27 +0000
Subject: Moving 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68
---
 .../samples/helloworld-ws-service-webapp/README    |   1 -
 .../samples/helloworld-ws-service-webapp/build.xml | 157 ---------------------
 .../samples/helloworld-ws-service-webapp/pom.xml   |  80 -----------
 .../src/main/java/helloworld/HelloWorldImpl.java   |  33 -----
 .../main/java/helloworld/HelloWorldService.java    |  30 ----
 .../src/main/resources/wsdl/helloworld.wsdl        |  79 -----------
 .../sca-deployables/helloworldws.composite         |  32 -----
 .../src/main/webapp/WEB-INF/geronimo-web.xml       |  33 -----
 .../src/main/webapp/WEB-INF/web.xml                |  45 ------
 9 files changed, 490 deletions(-)
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/README
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/pom.xml
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
 delete mode 100644 branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml

(limited to 'branches/sca-java-1.x/samples/helloworld-ws-service-webapp')

diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/README b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/README
+++ /dev/null
@@ -1 +0,0 @@
-http://localhost:8080/sample-helloworld-ws-service-webapp/SCA/HelloWorldService?wsdl
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml
deleted file mode 100644
index 0a4be34c47..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml
+++ /dev/null
@@ -1,157 +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.    
--->
-<project name="sample-helloworld-ws-service-webapp" default="compile">
-    <property file="${user.home}/tuscany/build.properties" />
-    <property file="${user.home}/build.properties" />
-
-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
-    <property name="tuscany.sca.lib.location" value="../../lib"/>
-    <property name="tuscany.sca.modules.location" value="../../modules"/>
-            
-    <path id="project.classpath">
-        <pathelement path="target/classes"/>
-        <pathelement path="target/sdo-source"/>
-        <pathelement location="${tuscany.sca.manifest.location}"/>
-    </path>
-    	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/sdo-source"/>
-    </target>
-	
-    	
-    <target name="compile" depends="init">
-        <javac destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-               <src location="src/main/java"/>
-               <src location="target/sdo-source"/>
-               <classpath refid="project.classpath"/>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-            <fileset dir="target/sdo-source"/>
-        </copy>
-        <war destfile="target/sample-helloworld-ws-service-webapp.war" 
-             webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>       	
-            <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">
-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-feed-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-core-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-databinding-sdo-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-distributed-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-extension-helper-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-interface-wsdl-runtime-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>         	
-            	<include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
-            </zipfileset>
-            <lib dir="${tuscany.sca.lib.location}">
-            	<include name="XmlSchema-1.3.1.jar"/>
-            	<include name="activation-1.1.jar"/>
-            	<include name="annogen-0.1.0.jar"/>
-            	<include name="ant-1.7.0.jar"/>
-            	<include name="ant-launcher-1.7.0.jar"/>
-            	<include name="axiom-api-1.2.4.jar"/>
-            	<include name="axiom-dom-1.2.4.jar"/>
-            	<include name="axiom-impl-1.2.4.jar"/>
-            	<include name="axis2-java2wsdl-1.2.jar"/>
-            	<include name="axis2-kernel-1.2.jar"/>
-            	<include name="backport-util-concurrent-2.2.jar"/>
-            	<include name="backport-util-concurrent-3.0.jar"/>
-            	<include name="cglib-nodep-2.1_3.jar"/>
-            	<include name="common-2.2.3.jar"/>
-            	<include name="commons-codec-1.3.jar"/>
-            	<include name="commons-fileupload-1.1.1.jar"/>
-            	<include name="commons-httpclient-3.1.jar"/>
-            	<include name="commons-io-1.1.jar"/>
-            	<include name="commons-logging-1.1.jar"/>
-            	<include name="ecore-2.2.3.jar"/>
-            	<include name="ecore-change-2.2.3.jar"/>
-            	<include name="ecore-xmi-2.2.3.jar"/>
-            	<include name="geronimo-commonj_1.1_spec-1.0.jar"/>
-            	<include name="geronimo-jms_1.1_spec-1.1.jar"/>
-            	<include name="jakarta-httpcore-4.0-alpha4.jar"/>
-            	<include name="jaxb-api-2.1.jar"/>
-            	<include name="jaxb-impl-2.1.4.jar"/>
-            	<include name="jaxen-1.1-beta-9.jar"/>
-            	<include name="jaxws-api-2.1.jar"/>
-            	<include name="jdom-1.0.jar"/>
-            	<include name="json-rpc-1.0.jar"/>
-            	<include name="jsr181-api-1.0-MR1.jar"/>
-            	<include name="jsr250-api-1.0.jar"/>
-            	<include name="mail-1.4.jar"/>
-            	<include name="neethi-2.0.1.jar"/>
-            	<include name="rome-0.9.jar"/>
-            	<include name="saaj-api-1.3.jar"/>
-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>
-            	<include name="stax-api-1.0-2.jar"/>
-            	<include name="stax-api-1.0.1.jar"/>
-            	<include name="woden-1.0-incubating-M7a.jar"/>
-            	<include name="wsdl4j-1.6.2.jar"/>
-            	<include name="wstx-asl-3.2.1.jar"/>
-            	<include name="xercesImpl-2.8.1.jar"/>
-            	<include name="xml-apis-1.3.03.jar"/>
-            	<include name="xsd-2.2.3.jar"/>
-            	<include name="tuscany-sdo-api-r2.1-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-sdo-impl-1.6-SNAPSHOT.jar"/>
-            	<include name="tuscany-sdo-lib-1.6-SNAPSHOT.jar"/>
-            </lib>        	
-            <classes dir="target/classes"/>
-            <classes dir="target/sdo-source"/>
-        </war>
-    </target>	
-	
-    <target name="package" depends="compile"/>
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/pom.xml b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/pom.xml
deleted file mode 100644
index 2399c4f29c..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/pom.xml
+++ /dev/null
@@ -1,80 +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-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
-    </parent>
-    <artifactId>sample-helloworld-ws-service-webapp</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
-    <packaging>war</packaging>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ /dev/null
@@ -1,32 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    name="helloworldws">
-
-    <service name="HelloWorldService" promote="HelloWorldComponent">
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws />
-    </service>
-
-    <component name="HelloWorldComponent">
-       <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index dea8c1cb23..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,33 +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 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-ws-service-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3f3c92fa78..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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 HelloWorld Web Service Sample</display-name>
-    
-    <listener>
-        <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-
-    <servlet>
-        <servlet-name>TuscanyServlet</servlet-name>
-        <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
-    </servlet>
- 
-    <servlet-mapping>
-        <servlet-name>TuscanyServlet</servlet-name>
-        <url-pattern>/SCA/*</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list id="WelcomeFileList">
-        <welcome-file>/SCA/HelloWorldComponent/HelloWorldService?wsdl</welcome-file>
-    </welcome-file-list>  
-
-</web-app>
-- 
cgit v1.2.3