From 335008cf65f2f1447b15a1a5d6e7f4852c17f2a6 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 9 Apr 2009 12:37:00 +0000
Subject: Rename old M2 tag to RC2 (keeping it for now to diff btw RC3 tag

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@763626 13f79535-47bb-0310-9956-ffa450edef68
---
 .../META-INF/maven/archetype-metadata.xml          |  37 ------
 .../main/resources/META-INF/maven/archetype.xml    |  31 -----
 .../src/main/resources/archetype-resources/pom.xml | 136 ---------------------
 .../src/main/java/HelloworldImpl.java              |  27 ----
 .../src/main/java/HelloworldService.java           |  25 ----
 .../src/main/webapp/WEB-INF/web.composite          |  34 ------
 .../src/main/webapp/WEB-INF/web.xml                |  41 -------
 .../archetype-resources/src/main/webapp/hello.jsp  |  36 ------
 8 files changed, 367 deletions(-)
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp

(limited to 'tags/java/sca/2.0-M2/archetypes/quickstart/src')

diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 239e554f93..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,37 +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.    
--->
-<archetype-descriptor name="myproject">
-  <fileSets>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/webapp</directory>
-      <includes>
-        <include>**/*.jsp</include>
-        <include>**/*.xml</include>
-        <include>**/*.composite</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 0ce3e579f2..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,31 +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.    
--->
-<archetype>
-  <id>tuscany-quickstart</id>
-  <sources>
-    <source>src\main\java\HelloworldImpl.java</source>
-    <source>src\main\java\HelloworldService.java</source>
-  </sources>
-  <resources>
-    <resource>src\main\webapp\hello.jsp</resource>
-    <resource>src\main\webapp\WEB-INF\web.composite</resource>
-    <resource>src\main\webapp\WEB-INF\web.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 60125e573e..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,136 +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>
-	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
-	<packaging>war</packaging>
-	<version>${version}</version>
-	#literal()<!-- TODO project name  -->
-	<name>quickstart</name>
-	<description></description>
-
-	<dependencies>
-		<!--  TUSCANY DEPENDENCIES -->
-            <dependency>
-               <groupId>org.apache.tuscany.sca</groupId>
-               <artifactId>tuscany-sca-api</artifactId>
-               <version>${tuscany.version}</version>
-            </dependency>
-
-            <dependency>
-               <groupId>org.apache.tuscany.sca</groupId>
-               <artifactId>tuscany-implementation-web-runtime</artifactId>
-               <version>${tuscany.version}</version>
-               <scope>runtime</scope>
-            </dependency>
-
-		<!--  JUNIT DEPENDENCY FOR TESTING -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!--  JETTY DEPENDENCIES FOR TESTING  -->
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-management</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-	<build>
-            <defaultGoal>install</defaultGoal>
-            <finalName>${artifactId}</finalName>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<filtering>false</filtering>
-				<directory>src/test/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
-		<plugins>
-			<plugin>
-				<inherited>true</inherited>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-					<optimise>true</optimise>
-					<debug>true</debug>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<configuration>
-					<downloadSources>true</downloadSources>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<properties>
-		<tuscany.version>2.0-M2</tuscany.version>
-		<jetty.version>6.1.4</jetty.version>
-	</properties>
-	#end
-</project>
diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
deleted file mode 100644
index 2491816adc..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ /dev/null
@@ -1,27 +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 ${package};
-
-public class HelloworldImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
deleted file mode 100644
index 352c165731..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/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 ${package};
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 218624f16a..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/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.0"
-           targetNamespace="http://${package}"
-           name=">${artifactId}">
-
-    <component name="${artifactId}WebComponent">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="${package}.HelloworldImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f2bdfe3362..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/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>${artifactId}</display-name>
-
-  <filter>
-    <filter-name>tuscany.${artifactId}</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany.${artifactId}</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/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
deleted file mode 100644
index 9729ca6823..0000000000
--- a/tags/java/sca/2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/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="${package}.HelloworldService" />
-
-<html>
-  <body >
-
-    <h2>${artifactId}</h2>
-
-    Calling HelloworldService sayHello("world") returns:
-
-    <p>
-
-    <%= service.sayHello("world") %>
-
-  </body>
-</html>
-- 
cgit v1.2.3