From fb3dd9a9095abc40027318b1712d0184f6d60e73 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 30 Oct 2009 08:00:47 +0000
Subject: 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
---
 .../contribution-zip/META-INF/MANIFEST.MF          |  11 --
 .../archetypes/contribution-zip/pom.xml            |  50 -------
 .../META-INF/maven/archetype-metadata.xml          |  36 -----
 .../main/resources/META-INF/maven/archetype.xml    |  30 ----
 .../src/main/resources/archetype-resources/pom.xml | 153 ---------------------
 .../archetype-resources/src/main/java/AddImpl.java |  38 -----
 .../src/main/java/AddService.java                  |  25 ----
 .../main/resources/META-INF/sca-contribution.xml   |  23 ----
 .../src/main/resources/add.composite               |  29 ----
 9 files changed, 395 deletions(-)
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/pom.xml
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
 delete mode 100644 branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite

(limited to 'branches/sca-java-2.0-M4/archetypes/contribution-zip')

diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
deleted file mode 100644
index b5be2573dd..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Name: Apache Tuscany SCA Contribution ZIP
-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 ZIP Contribution Archetype
-Bundle-SymbolicName: org.apache.tuscany.sca.archetype.contribution.zip 
-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-zip/pom.xml b/branches/sca-java-2.0-M4/archetypes/contribution-zip/pom.xml
deleted file mode 100644
index 48b0ea2c9f..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/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-zip</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create an SCA ZIP 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-zip/src/main/resources/META-INF/maven/archetype-metadata.xml b/branches/sca-java-2.0-M4/archetypes/contribution-zip/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-zip/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-zip/src/main/resources/META-INF/maven/archetype.xml b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index c17535e802..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/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-zip</id>
-  <sources>
-    <source>src/main/java/AddImpl.java</source>
-    <source>src/main/java/AddService.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/resources/add.composite</resource>
-    <resource>src/main/resources/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-zip/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index e2667701b0..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,153 +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>
-
-        <!--
-            AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP
-        -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <!--  AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP -->
-        <dependency>
-           <groupId>commons-math</groupId>
-           <artifactId>commons-math</artifactId>
-           <version>1.2</version>
-        </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>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-3</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-zip-contribution-descriptor</artifactId>
-                        <version>${tuscany.version}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <!-- This is where we use our shared assembly descriptor -->
-                            <descriptors>
-                                <descriptor>tuscany-zip-contribution.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </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-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
deleted file mode 100644
index 48b62dbb6f..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
+++ /dev/null
@@ -1,38 +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.apache.commons.math.util.MathUtils;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.EagerInit;
-
-@Scope("COMPOSITE") @EagerInit
-public class AddImpl implements AddService {
-
-    public int add(int x, int y) {
-        return MathUtils.addAndCheck(x, y);
-    }
-
-    @Init
-    public void init() {
-        System.out.println("1 + 2 = " + add(1, 2));
-    }
-}
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
deleted file mode 100644
index 4b25553893..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.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 AddService {
-
-    int add(int x, int y);
-
-}
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-2.0-M4/archetypes/contribution-zip/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-zip/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-zip/src/main/resources/archetype-resources/src/main/resources/add.composite b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
deleted file mode 100644
index 2a8b041849..0000000000
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.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.0"
-           targetNamespace="http://${package}"
-           name="${artifactId}">
-
-    <component name="AddComponent">
-        <implementation.java class="${package}.AddImpl"/>
-    </component>
-
-</composite>
-- 
cgit v1.2.3