Delete old M4 branch and start again to pick up all the recent trunk changes

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

1 files changed, 0 insertions, 188 deletions

diff --git a/branches/sca-java-2.0-M4/itest/distribution/webapp-helloworld-js-client/pom.xml b/branches/sca-java-2.0-M4/itest/distribution/webapp-helloworld-js-client/pom.xml
deleted file mode 100644
index 8649b9354c..0000000000
--- a/branches/sca-java-2.0-M4/itest/distribution/webapp-helloworld-js-client/pom.xml
+++ /dev/null
@@ -1,188 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-distribution</artifactId>

-        <version>2.0-M4-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-distribution-webapp-helloworld-js-client</artifactId>

-    <name>Apache Tuscany SCA iTest Distribution Webapp helloworld-js-client</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-bin-distro-unzip</artifactId>

-            <type>pom</type>

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>helloworld-js-client</artifactId>

-            <type>war</type>

-            <version>2.0-M4-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>htmlunit</groupId>

-            <artifactId>htmlunit</artifactId>

-            <version>1.9</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.mortbay.jetty</groupId>

-            <artifactId>jsp-2.0</artifactId>

-            <version>6.1.19</version>

-            <type>pom</type>

-            <scope>compile</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.cargo</groupId>

-                <artifactId>cargo-maven2-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>start-container</id>

-                        <phase>compile</phase>

-                        <goals>

-                            <goal>start</goal>

-                        </goals>

-                    </execution>

-                    <execution>

-                        <id>stop-container</id>

-                        <phase>post-integration-test</phase>

-                        <goals>

-                            <goal>stop</goal>

-                        </goals>

-                    </execution>

-                </executions>

-                <configuration>

-                    <wait>false</wait>

-                    <container>

-                        <!--

-                            you can call the containerid anything that doesn't start with 'jetty' (Jetty will work fine)

-                            if it starts with 'jetty' it will use the automatic dependency mechanism which you don't

-                            want

-                        -->

-                        <containerId>latest-jetty6x</containerId>

-                        <implementation>org.codehaus.cargo.container.jetty.Jetty6xEmbeddedLocalContainer

-                        </implementation>

-                        <type>embedded</type>

-                        <dependencies>

-                            <!-- add all the other dependencies that the embedded jetty server needs here -->

-                            <dependency>

-                                <groupId>org.mortbay.jetty</groupId>

-                                <artifactId>jetty</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>org.mortbay.jetty</groupId>

-                                <artifactId>jetty-util</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>javax.servlet</groupId>

-                                <artifactId>servlet-api</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>org.mortbay.jetty</groupId>

-                                <artifactId>jsp-2.0</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>tomcat</groupId>

-                                <artifactId>jasper-runtime</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>tomcat</groupId>

-                                <artifactId>jasper-compiler</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>commons-logging</groupId>

-                                <artifactId>commons-logging</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>tomcat</groupId>

-                                <artifactId>jasper-compiler-jdt</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>org.mortbay.jetty</groupId>

-                                <artifactId>jsp-api-2.0</artifactId>

-                            </dependency>

-                            <dependency>

-                                <groupId>commons-el</groupId>

-                                <artifactId>commons-el</artifactId>

-                            </dependency>

-

-                        </dependencies>

-                    </container>

-                    <!-- Uncomment the following to enable Tomcat container -->

-                    <!-- 

-                    <container>

-                        <containerId>tomcat6x</containerId>

-                        <home>/Tomcat/apache-tomcat-6.0.18</home>

-                    </container>

-                    -->

-                    <configuration>

-                        <implementation>org.codehaus.cargo.container.jetty.Jetty6xEmbeddedStandaloneLocalConfiguration

-                        </implementation>

-

-                        <home>${project.build.directory}/cargo-jetty</home>

-                        <properties>

-                            <!--

-                                NOTE: remote debugging doesn't work with the embedded Jetty container. To remote debug

-                                uncomment/comment the container above to be the Tomcat container and set home to point

-                                to your local Tomcat installation

-                            -->

-                            <cargo.jvmargs><![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y]]></cargo.jvmargs>

-                            <cargo.servlet.port>8085</cargo.servlet.port>

-                            <context>helloworld-jsp</context>

-                        </properties>

-                        <deployables>

-                            <deployable>

-                                <groupId>org.apache.tuscany.sca</groupId>

-                                <artifactId>helloworld-js-client</artifactId>

-                                <type>war</type>

-                                <properties>

-                                    <context>helloworld-js-client</context>

-                                </properties>

-                            </deployable>

-                        </deployables>

-                    </configuration>

-                </configuration>

-            </plugin>

-

-        </plugins>

-    </build>

-</project>