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
---
 .../src/main/webapp/WEB-INF/geronimo-web.xml       | 49 ----------------------
 .../src/main/webapp/WEB-INF/web.composite          | 36 ----------------
 .../src/main/webapp/WEB-INF/web.xml                | 41 ------------------
 3 files changed, 126 deletions(-)
 delete mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
 delete mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml

(limited to 'branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF')

diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 2563c8b7c8..0000000000
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,49 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
-  <environment>
-    <moduleId>
-      <groupId>test</groupId>
-      <artifactId>helloworld-web</artifactId>
-      <version>1.0</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>test</groupId>
-        <artifactId>helloworld-ejb</artifactId>
-        <version>1.0</version>
-        <type>jar</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes />
-    <non-overridable-classes />
-  </environment>
-  <context-root>helloworld-web</context-root>
-  <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
-    <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name>
-    <nam:pattern>
-      <nam:groupId>test</nam:groupId>
-      <nam:artifactId>helloworld-ejb</nam:artifactId>
-      <nam:version>1.0</nam:version>
-      <nam:name>HelloworldServiceBean</nam:name>
-    </nam:pattern>
-  </nam:ejb-ref>
-</web-app>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 823085e81f..0000000000
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,36 +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"
-           targetNamespace="http://sample"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="Helloworld-web">
-
-    <component name="HelloworldWebComponent">
-        <implementation.java class="sample.HelloworldEjbServlet"/>
-        <reference name="helloworldSca">
-            <interface.java interface="sample.ejb3.HelloworldService"/>
-            <binding.sca uri="http://localhost:8080/SomeService"/>
-        </reference>
-    </component>
-    
-    <reference name="helloworldSca" promote="HelloworldWebComponent/helloworldSca"/>
-
-</composite>
-
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 628588a974..0000000000
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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>Helloworld Web Sample</display-name>
-
-  <servlet>
-     <servlet-name>HelloworldEjbServlet</servlet-name>
-     <servlet-class>sample.HelloworldEjbServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>HelloworldEjbServlet</servlet-name>
-     <url-pattern>/HelloworldEjbServlet</url-pattern>
-  </servlet-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>hello.html</welcome-file>
-  </welcome-file-list>
-
-</web-app>
-- 
cgit v1.2.3