From 35f81a620ea2d8423a49d8630bcef1d69027f444 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 28 Mar 2009 09:44:15 +0000
Subject: Remove old m2 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@759447 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/sample/HelloworldService.java    | 25 -------------
 .../main/java/sample/HelloworldServiceImpl.java    | 28 ---------------
 .../src/main/webapp/WEB-INF/web.composite          | 34 ------------------
 .../helloworld-jsp/src/main/webapp/WEB-INF/web.xml | 41 ----------------------
 .../helloworld-jsp/src/main/webapp/hello.jsp       | 37 -------------------
 5 files changed, 165 deletions(-)
 delete mode 100644 branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
 delete mode 100644 branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp

(limited to 'branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src')

diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +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;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,28 +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;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 56ed55b2d5..0000000000
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ /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.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="foo">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a5b03d4904..0000000000
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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 JSP 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>hello.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index ffd01cca73..0000000000
--- a/branches/sca-java-2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ /dev/null
@@ -1,37 +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 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="sample.HelloworldService" />
-
-<html>
-  <body >
-
-    <h2>Apache Tuscany Helloworld JSP Sample</h2>
-
-    Calling HelloworldService sayHello("world") returns:
-
-    <p>
-
-    <%= service.sayHello("world") %>
-
-  </body>
-</html>
-- 
cgit v1.2.3