Moving 2.x branches

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

9 files changed, 0 insertions, 353 deletions

diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 1e2a0fbb4d..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Name: Apache Tuscany SCA Contribution JAR

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Quickstart Archetype

-Bundle-SymbolicName: org.apache.tuscany.sca.archetype.contribution.jar 

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml b/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml
deleted file mode 100644
index a172e856a3..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/pom.xml
+++ /dev/null
@@ -1,50 +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>tuscany-sca</artifactId>
-        <version>2.0-M4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-contribution-jar</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create an SCA JAR contribution project</name>
-
-    <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.0-alpha-3</version>
-      </extension>
-    </extensions>
-    <plugins>
-      <plugin>
-        <artifactId>maven-archetype-plugin</artifactId>
-        <version>2.0-alpha-3</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 46c5cd6dca..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,36 +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/resources</directory>
-      <includes>
-        <include>**/*.xml</include>
-        <include>**/*.composite</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 69c3fb5ac9..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.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.    
--->
-<archetype>
-  <id>tuscany-contribution-jar</id>
-  <sources>
-    <source>src/main/java/HelloworldImpl.java</source>
-    <source>src/main/java/HelloworldService.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/hello.composite</resource>
-    <resource>src/main/webapp/META-INF/sca-contribution.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index ede059f1e3..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,110 +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>jar</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>
-               <scope>provided</scope>
-            </dependency>
-
-		<!--  JUNIT DEPENDENCY FOR TESTING -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.5</version>
-			<scope>test</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.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<configuration>
-					<downloadSources>true</downloadSources>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.maven.plugins</groupId>
-				<artifactId>maven-tuscany-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-	<properties>
-		<tuscany.version>2.0-M4-SNAPSHOT</tuscany.version>
-	</properties>
-	#end
-</project>
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
deleted file mode 100644
index 26237c105c..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ /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.    
- */
-package ${package};
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.EagerInit;
-
-@Scope("COMPOSITE") @EagerInit
-public class HelloworldImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-    @Init
-    public void init() {
-        System.out.println(sayHello("world"));
-    }
-}
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
deleted file mode 100644
index d705564334..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.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 ${package};
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 8608a99897..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-              xmlns:sample="http://${package}">
-   <deployable composite="sample:${artifactId}"/>
-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
deleted file mode 100644
index aacf93e66a..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,29 +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.1"
-           targetNamespace="http://${package}"
-           name="${artifactId}">
-
-    <component name="HelloworldComponent">
-        <implementation.java class="${package}.HelloworldImpl"/>
-    </component>
-
-</composite>