Delete old beta3 branch as its going to be recreated from the current trunk

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

8 files changed, 0 insertions, 432 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/README b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/README
deleted file mode 100644
index bcf11d9886..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/README
+++ /dev/null
@@ -1,32 +0,0 @@
-Tuscany - Getting Started - Helloworld WebApp Sample

-----------------------------------------------------

-

-This sample demonstrates how to use SCA contributions with Web Applications

-

-See the README in the top-level samples folder for general information on the Tuscany samples.

-

-This sample project creates a .war web application which includes Tuscany. The SCA contribution

-from the helloworld sample is included within the war and its SCA composite started by the webapp,

-and there is a JSP page which shows how to invoke SCA services by using the SCA taglib.

-

-As this sample creates a web application .war archive there is a manual step to deploy the WAR file

-to your web application server. The archive is the helloworld-webapp-<version>.war in the target folder.

-Alternatively, you can run it by using the Maven Tomcat plugin by using the following command:

-

-   mvn tomcat:run

-

-or if you prefer Jetty then:

-

-   mvn jetty:run

-

-Once the web app is running use your browser to visit the following URL;

-

-http://localhost:8080/helloworld-webapp

-

-(The port and hostname will of course vary depending on your local installation) 

-

-You should then see the web page return the following:

-

-   Calling HelloworldService sayHello("world") returns:

-

-   Hello world 
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml
deleted file mode 100644
index 9348515a27..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/pom.xml
+++ /dev/null
@@ -1,181 +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.    
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.apache.tuscany.sca.samples</groupId>
-      <artifactId>tuscany-samples</artifactId>
-      <version>2.0-Beta3-SNAPSHOT</version>
-      <relativePath>../../pom.xml</relativePath>
-   </parent>
-
-   <artifactId>helloworld-webapp</artifactId>
-   <version>2.0-Beta3-SNAPSHOT</version>
-
-   <name>Apache Tuscany SCA Samples Helloworld WebApp</name>
-   <packaging>war</packaging>
-
-   <properties>
-      <tuscany.version>${project.version}</tuscany.version>
-   </properties>
-
-   <!-- ASF repositories so sample can be built from SVN without building trunk-->
-   <repositories><repository>
-       <id>apache.snapshots</id>
-       <name>Apache Snapshot Repository</name>
-       <url>http://repository.apache.org/snapshots</url>
-       <releases><enabled>false</enabled></releases>
-   </repository></repositories>
-   <pluginRepositories><pluginRepository>
-       <id>apache.snapshots</id>
-       <name>Apache Snapshot Repository</name>
-       <url>http://repository.apache.org/snapshots</url>
-       <releases><enabled>false</enabled></releases>
-   </pluginRepository></pluginRepositories>
-
-   <dependencies>
-
-      <dependency>
-         <groupId>org.apache.tuscany.sca</groupId>
-         <artifactId>tuscany-base-runtime</artifactId>
-         <version>${tuscany.version}</version>
-      </dependency>         
-
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>4.8.1</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>net.sourceforge.htmlunit</groupId>
-         <artifactId>htmlunit</artifactId>
-         <version>2.6</version>
-         <scope>test</scope>
-         <exclusions>
-             <exclusion>
-                 <groupId>xalan</groupId>
-                 <artifactId>xalan</artifactId>
-             </exclusion> 
-         </exclusions>        
-      </dependency>
-
-      <!-- replace HTMLUnit dependency with verstion that Tuscany is using -->
-      <dependency>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-          <version>2.7.0</version>
-          <scope>test</scope>
-          <exclusions>
-             <exclusion>
-                 <groupId>xml-apis</groupId>
-                 <artifactId>xml-apis</artifactId>
-             </exclusion>                              
-          </exclusions>            
-      </dependency>  
-
-   </dependencies>
-
-    <build>
-       <plugins>
-
-          <!-- this copies the SCA contribution from the helloworld sample into this webapp -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                   <artifactItems>
-                     <artifactItem>
-                       <groupId>org.apache.tuscany.sca.samples</groupId>
-                       <artifactId>helloworld</artifactId>
-                       <version>${project.version}</version>
-                       <!-- should really go in the target folder but i can't get jetty:run or tomcat:run to work using that -->
-                       <outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory>
-                     </artifactItem>
-                   </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <!-- to support running thw webapp with mvn tuscany:run -->
-         <plugin>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-plugin</artifactId>
-            <version>${tuscany.version}</version>
-         </plugin>
-
-          <!-- to support using mvn jetty:run and also to run the webapp for the integration test -->
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.26</version>
-             <configuration>
-                <contextPath>helloworld-webapp</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-
-          <!-- to support using mvn tomcat:run -->
-          <plugin>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>tomcat-maven-plugin</artifactId>
-             <version>1.1</version>
-          </plugin>
-
-       </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/java/sample/Helloworld.java b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/java/sample/Helloworld.java
deleted file mode 100644
index 1eeb8be9fd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/java/sample/Helloworld.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;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
-    String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 0c03826f99..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,30 +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/200912"

-           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>

-

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b83a9c3417..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/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 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/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/main/webapp/hello.jsp
deleted file mode 100644
index 57abb08ca2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/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.Helloworld" />

-

-<html>

-  <body >

-

-    <h2>Apache Tuscany Helloworld JSP Sample</h2>

-

-    Calling HelloworldService sayHello("world") returns:

-

-    <p>

-

-    <%= service.sayHello("world") %>

-

-  </body>

-</html>

diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/test/java/itest/HelloworldTestCase.java
deleted file mode 100644
index 40da70b98d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/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-webapp");
-        Iterator<?> ss = page.getAllHtmlChildElements().iterator();
-        while(ss.hasNext()) {
-            HtmlElement htmlElement = (HtmlElement) ss.next();
-            if( htmlElement instanceof HtmlParagraph) {
-                assertEquals("Hello world", htmlElement.asText());
-                break;
-            }
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml b/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml
deleted file mode 100644
index 4ca1c962a0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/src/test/resources/test-web.xml
+++ /dev/null
@@ -1,30 +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" >
-
-  <context-param>
-    <param-name>org.apache.tuscany.sca.config</param-name>
-    <param-value>uri:default?bind=127.0.0.1:54321</param-value>
-  </context-param>
-
-</web-app>