Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 0 insertions, 131 deletions

diff --git a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java b/branches/sca-java-1.5/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;

-

-public interface HelloworldService {

-	

-	String sayHello(String name);

-

-}

diff --git a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-java-1.5/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;

-

-import org.osoa.sca.annotations.Service;

-

-@Service(HelloworldService.class)

-public class HelloworldServiceImpl implements HelloworldService {

-

-	public String sayHello(String name) {

-		return "Hello " + name;

-	}

-

-}

diff --git a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 16bc08fc10..0000000000
--- a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/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://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://samples"

-           name="Helloworld">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldService" />

-    </component>

-

-    <component name="HelloworldService">

-        <implementation.java class="sample.HelloworldServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 46285614da..0000000000
--- a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +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-1.5/samples/helloworld-jsp/src/main/webapp/hello.jsp b/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index beac8e457f..0000000000
--- a/branches/sca-java-1.5/samples/helloworld-jsp/src/main/webapp/hello.jsp
+++ /dev/null
@@ -1,36 +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>