From ebb89430400c2cb1d1c74ca18927375ff41601cc Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 5 Feb 2009 07:55:03 +0000
Subject: Move the contrib folder out of the sca trunk build as discussed on
 the ML

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741038 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/META-INF/sca-contribution.xml  | 23 ----------
 .../src/main/webapp/WEB-INF/geronimo-web.xml       | 34 ---------------
 .../src/main/webapp/WEB-INF/web.composite          | 24 -----------
 .../src/main/webapp/WEB-INF/web.xml                | 41 ------------------
 .../src/main/webapp/calc.jsp                       | 50 ----------------------
 5 files changed, 172 deletions(-)
 delete mode 100644 java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
 delete mode 100644 java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp

(limited to 'java/sca/contrib/samples/host-webapp-calculator/src/main/webapp')

diff --git a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 8e3132eaa1..0000000000
--- a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Calculator"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 59bbb0de83..0000000000
--- a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,34 +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-calculator-ws-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index e839694501..0000000000
--- a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,24 +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"
-           xmlns:sample="http://sample"
-           name="Calculator">
-    <include name="sample:Calculator"/>
-</composite>
diff --git a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 701ba48203..0000000000
--- a/java/sca/contrib/samples/host-webapp-calculator/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>Apache Tuscany Calculator Web Service Sample</display-name>
-
-  <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>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>calc.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp b/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
deleted file mode 100644
index 4c4366747d..0000000000
--- a/java/sca/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
+++ /dev/null
@@ -1,50 +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.
---%>
-
-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
-<%@ page import="calculator.CalculatorService" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
-   CalculatorService calculatorService = (CalculatorService)scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-%>
-<html>
-<head><title>Calculator sample</title></head>
-
-<body>
-<table>
-    <tr>
-        <th>Expression</th><th>Result</th>
-    </tr>
-    <tr>
-        <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
-    </tr>
-    <tr>
-        <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
-    </tr>
-    <tr>
-        <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>
-    </tr>
-    <tr>
-        <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>
-    </tr>    
-</table>
-</body>
-</html>
-- 
cgit v1.2.3