From 0d6d7922ed17cca55ec36ff2626d1080e76d6d13 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 Oct 2010 07:11:27 +0000 Subject: Remove old beta1 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027389 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 --------------- .../src/test/java/itest/HelloworldTestCase.java | 53 ---------------------- 6 files changed, 218 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java (limited to 'sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src') diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/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/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index a22c095f29..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/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/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index fa1f7ad7b9..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Apache Tuscany Helloworld JSP Sample - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - - hello.jsp - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp deleted file mode 100644 index ffd01cca73..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,37 +0,0 @@ - - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %> - - - - - - -

Apache Tuscany Helloworld JSP Sample

- - Calling HelloworldService sayHello("world") returns: - -

- - <%= service.sayHello("world") %> - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 665957b0eb..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,53 +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 itest; - -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Iterator; - -import org.junit.Test; - -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlParagraph; - -/** - */ -public class HelloworldTestCase { - - @Test - public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException { - HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp"); - Iterator ss = page.getAllHtmlChildElements().iterator(); - while(ss.hasNext()) { - HtmlElement htmlElement = (HtmlElement) ss.next(); - if( htmlElement instanceof HtmlParagraph) { - assertEquals("Hello world", htmlElement.asText()); - break; - } - } - } - -} -- cgit v1.2.3