Official Tuscany 2.0.1 Release

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

170 files changed, 0 insertions, 8627 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/pom.xml
deleted file mode 100644
index 8a1efdf1fc..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/pom.xml
+++ /dev/null
@@ -1,54 +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/xsd/maven-4.0.0.xsd">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0.1</version>

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

-    </parent>

-

-    <artifactId>tuscany-binding-archetype</artifactId>

-    <packaging>maven-archetype</packaging>

-    <name>Create a Tuscany binding extension project</name>

-    <description>Create a Tuscany binding extension project</description>

-

-    <build>

-       <extensions>

-          <extension>

-             <groupId>org.apache.maven.archetype</groupId>

-             <artifactId>archetype-packaging</artifactId>

-             <version>2.2</version>

-          </extension>

-       </extensions>

-

-       <pluginManagement>

-          <plugins>

-             <plugin>

-                <artifactId>maven-archetype-plugin</artifactId>

-                <version>2.2</version>

-               <extensions>true</extensions>

-             </plugin>

-          </plugins>

-       </pluginManagement>

-    </build>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 403803551b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,61 +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 xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="tuscany-binding-foo-runtime"

-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-  <requiredProperties>

-    <requiredProperty key="bindingName">

-    </requiredProperty>

-  </requiredProperties>

-

-  <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>**/*.*</include>

-      </includes>

-    </fileSet>

-    <fileSet filtered="true" encoding="UTF-8">

-      <directory>src/test/java</directory>

-      <includes>

-        <include>**/*.java</include>

-      </includes>

-    </fileSet>

-    <fileSet filtered="true" encoding="UTF-8">

-      <directory>src/test/resources</directory>

-      <includes>

-        <include>**/*.*</include>

-      </includes>

-    </fileSet>

-    <fileSet filtered="true" encoding="UTF-8">

-      <directory>META-INF</directory>

-      <includes>

-        <include>MANIFEST.MF</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-</archetype-descriptor>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 2985b8c822..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA ${bindingName} Binding

-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 ${bindingName} Binding

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.${artifactId}

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

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

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 1aebc38eb0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,94 +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-modules</artifactId>

-        <version>2.0.1</version>

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

-    </parent>

-

-    <artifactId>binding-${artifactId}</artifactId>

-    <groupId>${groupId}</groupId>

-    <version>${version}</version>

-    <name>Apache Tuscany SCA ${bindingName} Binding Extension</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-http</artifactId>

-            <version>2.0.1</version>

-            <scope>provided</scope>

-        </dependency>   

-                

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0.1</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0.1</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0.1</version>

-            <scope>test</scope>

-        </dependency>    

-

-        <dependency>

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

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0.1</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java
deleted file mode 100644
index d9cbdb954d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java
+++ /dev/null
@@ -1,52 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.provider.BaseBindingImpl;

-

-/**

- * Represents a binding to a ${bindingName} service.

- */

-public class ${bindingName}Binding extends BaseBindingImpl {

-

-    public static final QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.${artifactId}");

-

-    private String someAttr;

-

-    public ${bindingName}Binding() {

-    }

-

-    public QName getType() {

-        return TYPE;

-    }

-    

-    public String getSomeAttr() {

-        return someAttr;

-    }

-

-    public void setSomeAttr(String someAttr) {

-        this.someAttr = someAttr;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java
deleted file mode 100644
index ae1cd88745..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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};

-

-

-/**

- * Factory implementation to create ${bindingName} Models

- */

-public class ${bindingName}BindingFactory {

-

-    public ${bindingName}Binding create${bindingName}Binding() {

-        return new ${bindingName}Binding();

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java
deleted file mode 100644
index 93c6bf3c04..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import ${package}.${bindingName}Binding;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.provider.BindingProviderFactory;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;

-

-public class ${bindingName}BindingProviderFactory implements BindingProviderFactory<${bindingName}Binding> {

-

-    public ${bindingName}BindingProviderFactory(ExtensionPointRegistry extensionPoints) {

-    }

-

-    public Class<${bindingName}Binding> getModelType() {

-        return ${bindingName}Binding.class;

-    }

-

-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpoint) {

-        return new ${bindingName}ReferenceBindingProvider(endpoint);

-    }

-

-    public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {

-        return new ${bindingName}ServiceBindingProvider(endpoint);

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java
deleted file mode 100644
index dc2991014e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import org.apache.tuscany.sca.assembly.EndpointReference;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-

-public class ${bindingName}ReferenceBindingProvider implements ReferenceBindingProvider {

-

-    private EndpointReference endpoint;

-    private InterfaceContract contract;

-

-    public ${bindingName}ReferenceBindingProvider(EndpointReference endpoint) {

-        this.endpoint = endpoint;

-    }

-    

-    public Invoker createInvoker(Operation operation) {

-        return new ${bindingName}ReferenceInvoker(operation, endpoint);

-    }

-

-    public void start() {

-    }

-

-    public void stop() {

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return contract;

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java
deleted file mode 100644
index d3e2bd1812..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java
+++ /dev/null
@@ -1,56 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import org.apache.tuscany.sca.assembly.EndpointReference;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-

-public class ${bindingName}ReferenceInvoker implements Invoker {

-    

-    protected Operation operation;

-    protected EndpointReference endpoint;

-

-    public ${bindingName}ReferenceInvoker(Operation operation, EndpointReference endpoint) {

-        this.operation = operation;

-        this.endpoint = endpoint;

-    }

-

-    public Message invoke(Message msg) {

-        try {

-

-            return doInvoke(msg);

-            

-        } catch (Exception e) {

-            throw new RuntimeException(e);

-        }

-    }

-

-    public Message doInvoke(Message msg) {

-        // Add some code here to make an invocation over the ${bindingName} binding protocol

-        // For this sample we'll just get it from the static stash

-        ${bindingName}ServiceInvoker fi = ${bindingName}Stash.getService(endpoint.getBinding().getURI());

-        return fi.invokeService(msg);

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java
deleted file mode 100644
index 59d41091d8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import ${package}.${bindingName}Binding;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-

-public class ${bindingName}ServiceBindingProvider implements ServiceBindingProvider {

-

-    private RuntimeEndpoint endpoint;

-    private InterfaceContract contract;

-

-    public ${bindingName}ServiceBindingProvider(RuntimeEndpoint endpoint) {

-        this.endpoint = endpoint;

-    }

-

-    public void start() {

-        // add some code here to start the service

-

-        // For this sample we'll just share it in a static

-        ${bindingName}Stash.addService(endpoint.getBinding().getURI(), new ${bindingName}ServiceInvoker(endpoint));

-        

-        System.out.println("someAttr=" + ((${bindingName}Binding)endpoint.getBinding()).getSomeAttr());

-    }

-

-    public void stop() {

-        ${bindingName}Stash.removeService(endpoint.getBinding().getURI());

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return contract;

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java
deleted file mode 100644
index 8ea20d41ed..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java
+++ /dev/null
@@ -1,43 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-

-public class ${bindingName}ServiceInvoker {

-

-    private RuntimeEndpoint wire;

-    

-    public ${bindingName}ServiceInvoker(RuntimeEndpoint wire) {

-        this.wire = wire;

-    }

-

-    /**

-     * Send the request down the wire to invoke the service 

-     */

-    public Message invokeService(Message msg) {

-        return wire.invoke(msg);

-    }

-    

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java
deleted file mode 100644
index 416a10e7b1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java
+++ /dev/null
@@ -1,47 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import java.util.HashMap;

-import java.util.Map;

-

-/**

- * Simplistic static Map to share service endpoints with references

- */

-public class ${bindingName}Stash {

-    

-    private static Map<String, ${bindingName}ServiceInvoker> services = new HashMap<String, ${bindingName}ServiceInvoker>();

-    

-    public static void addService(String uri, ${bindingName}ServiceInvoker ${bindingName}ServiceInvoker) {

-        services.put(uri, ${bindingName}ServiceInvoker);

-    }

-

-    public static ${bindingName}ServiceInvoker getService(String uri) {

-        return services.get(uri);

-    }

-

-    public static void removeService(String uri) {

-        services.remove(uri);

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory
deleted file mode 100644
index 3759b19fa0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for model factory

-${package}.${bindingName}BindingFactory

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index eb49133022..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.${artifactId},model=${package}.${bindingName}Binding,factory=${package}.${bindingName}BindingFactory

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index c33264f2a4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +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. 

-#

-binding-${artifactId}.xsd

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 3c0cfbc6d9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for the binding extension

-${package}.runtime.${bindingName}BindingProviderFactory;model=${package}.${bindingName}Binding

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd
deleted file mode 100644
index 74f853e424..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-#set( $bindingNameLC = ${bindingName} )<?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.    

--->

-<schema xmlns="http://www.w3.org/2001/XMLSchema" 

-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 

-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 

-    elementFormDefault="qualified">

-

-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" />

-

-    <element name="binding.${artifactId}" type="t:${bindingName}Binding" substitutionGroup="sca:binding"/>

-    

-    <complexType name="${bindingName}Binding">

-        <complexContent>

-            <extension base="sca:Binding">

-                <attribute name="someAttr" type="string" use="optional"/>

-            </extension>

-        </complexContent>

-    </complexType>

-</schema>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index de982cefc1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 helloworld;

-

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClient implements HelloWorldService {

-

-    @Reference

-    public HelloWorldService  ref;

-    

-    public String sayHello(String name) {

-        return ref.sayHello(name);

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 521f6828ce..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 helloworld;

-

-

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String sayHello(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index eca0df1543..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloWorldService {

-

-    String sayHello(String name);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/__bindingName__BindingTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/__bindingName__BindingTestCase.java
deleted file mode 100644
index 61847e5eda..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/__bindingName__BindingTestCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 test;

-

-import helloworld.HelloWorldService;

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class ${bindingName}BindingTestCase {

-

-    private static Node node;

-    

-    @Test

-    public void testSayHello() {

-        HelloWorldService service = node.getService(HelloWorldService.class, "HelloWorldClient/HelloWorldService");

-        Assert.assertEquals("Hello boo", service.sayHello("boo"));

-    }

-

-    @BeforeClass

-    public static void init() throws Exception {

-        node = NodeFactory.newInstance().createNode("helloworld.composite").start();

-    }

-    

-    @AfterClass

-    public static void destroy() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite
deleted file mode 100644
index f0e6150c10..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite
+++ /dev/null
@@ -1,39 +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://itest"

-           name="HelloWorldComposite">

-           

-    <component name="HelloWorldComponent">

-        <implementation.java class="helloworld.HelloWorldImpl"/>

-        <service name="HelloWorldService" >

-            <tuscany:binding.${artifactId} someAttr="bla" />

-        </service>

-    </component>   

-  

-    <component name="HelloWorldClient">

-        <implementation.java class="helloworld.HelloWorldClient"/>

-        <reference name="ref" >

-            <tuscany:binding.${artifactId} uri="HelloWorldComponent/HelloWorldService"/>

-        </reference>

-    </component>   

-

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/test/resources/projects/basic/archetype.properties b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index c15305edb4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,23 +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. 

-#Sat Sep 04 08:10:22 BST 2010

-version=0.1-SNAPSHOT

-groupId=archetype.it

-package=archetype.it.basic

-artifactId=basic

-bindingName=Basic

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 1e2a0fbb4d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/pom.xml
deleted file mode 100644
index c5a088d201..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>
-      <relativePath>../../../pom.xml</relativePath>
-   </parent>
-
-   <artifactId>tuscany-contribution-jar</artifactId>
-   <packaging>maven-archetype</packaging>
-   <name>Create an SCA JAR contribution project</name>
-   <description>Create an SCA JAR contribution project</description>
-
-   <build>
-      <extensions>
-         <extension>
-            <groupId>org.apache.maven.archetype</groupId>
-            <artifactId>archetype-packaging</artifactId>
-            <version>2.2</version>
-         </extension>
-      </extensions>
-      <plugins>
-         <plugin>
-            <artifactId>maven-archetype-plugin</artifactId>
-            <version>2.2</version>
-            <extensions>true</extensions>
-         </plugin>
-      </plugins>
-   </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 1e1c124869..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,49 +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" packaged="true" encoding="UTF-8">
-         <directory>src/test/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>
-      <fileSet filtered="true" encoding="UTF-8">
-         <directory>src/test/resources</directory>
-         <includes>
-            <include>**/*.xml</include>
-            <include>**/*.composite</include>
-         </includes>
-      </fileSet>
-   </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 6e0591fbfe..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,22 +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>
-</archetype>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index ffa029e184..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,87 +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>
-   <version>${version}</version>
-   <packaging>jar</packaging>
-
-   <name>${artifactId}</name>
-
-   <properties>
-      <tuscany.version>2.0</tuscany.version>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-   </properties>
-
-   <dependencies>
-
-      <dependency>
-         <groupId>org.apache.tuscany.sca</groupId>
-         <artifactId>tuscany-sca-api</artifactId>
-         <version>${tuscany.version}</version>
-         <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>4.8.1</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.apache.tuscany.sca</groupId>
-         <artifactId>tuscany-base-runtime</artifactId>
-         <version>${tuscany.version}</version>
-         <scope>test</scope>
-      </dependency>
-
-   </dependencies>
-
-   <build>
-      <defaultGoal>install</defaultGoal>
-      <finalName>${artifactId}</finalName>
-
-      <plugins>
-         <plugin>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-plugin</artifactId>
-            <version>${tuscany.version}</version>
-         </plugin>
-
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
-            <configuration>
-               <source>1.6</source>
-               <target>1.6</target>
-               <optimise>true</optimise>
-               <debug>true</debug>
-            </configuration>
-         </plugin>
-      </plugins>
-
-   </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/Helloworld.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/Helloworld.java
deleted file mode 100644
index 68f91f67cd..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/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 ${package};
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
-    String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
deleted file mode 100644
index f5af4c7366..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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 Helloworld {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-    @Init
-    public void init() {
-        System.out.println(sayHello("world"));
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d2e633d3d8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +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/200912"
-              xmlns:sample="http://${package}">
-   
-   <deployable composite="sample:${artifactId}" />
-
-</contribution>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
deleted file mode 100644
index 35970f63ca..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/200912"
-           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>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/test/java/HelloworldTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/test/java/HelloworldTestCase.java
deleted file mode 100644
index c98112cb93..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/src/test/java/HelloworldTestCase.java
+++ /dev/null
@@ -1,48 +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.junit.Assert;
-
-import org.apache.tuscany.sca.Node;
-import org.apache.tuscany.sca.TuscanyRuntime;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchServiceException;
-
-public class HelloworldTestCase {
-
-    @Test
-    public void testSayHello() throws NoSuchServiceException {
-
-        // Run the SCA composite in a Tuscany runtime
-        Node node = TuscanyRuntime.runComposite("helloworld.composite", "target/classes");
-        try {
-            
-            // Get the Helloworld service proxy
-            Helloworld helloworld = node.getService(Helloworld.class, "HelloworldComponent");
-            
-            // test that it works as expected
-            Assert.assertEquals("Hello Amelia", helloworld.sayHello("Amelia"));
-            
-        } finally {
-            // Stop the Tuscany runtime Node
-            node.stop();        
-        }
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip-discriptor/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip-discriptor/pom.xml
deleted file mode 100644
index 695fcd4675..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip-discriptor/pom.xml
+++ /dev/null
@@ -1,33 +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.1</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-zip-contribution-descriptor</artifactId>
-    <name>Tuscany SCA ZIP contribution Shared Assembly Descriptor</name>
-
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
deleted file mode 100644
index a672d2920d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
+++ /dev/null
@@ -1,40 +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.    
--->
-<assembly>
-  <id>zip-contribution</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.outputDirectory}</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/META-INF/MANIFEST.MF
deleted file mode 100644
index b5be2573dd..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/pom.xml
deleted file mode 100644
index 28e0a24cf5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-contribution-zip</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create an SCA ZIP contribution project</name>
-    <description>Create an SCA ZIP contribution project</description>
-
-    <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-    <plugins>
-      <plugin>
-        <artifactId>maven-archetype-plugin</artifactId>
-        <version>2.2</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 46c5cd6dca..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index c17535e802..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 44e3d8448a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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>${project.artifactId}</artifactId>
-    <packaging>jar</packaging>
-    <version>${project.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.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <finalName>${project.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</tuscany.version>
-    </properties>
-    #end
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
deleted file mode 100644
index 48b62dbb6f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
deleted file mode 100644
index 4b25553893..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 960d6a90ae..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/200912"
-              xmlns:sample="http://${package}">
-   <deployable composite="sample:${artifactId}"/>
-</contribution>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
deleted file mode 100644
index 3dc8175bd7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://${package}"
-           name="${artifactId}">
-
-    <component name="AddComponent">
-        <implementation.java class="${package}.AddImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/pom.xml
deleted file mode 100644
index a7d3968baa..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/pom.xml
+++ /dev/null
@@ -1,54 +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/xsd/maven-4.0.0.xsd">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0.1</version>

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

-    </parent>

-

-    <artifactId>tuscany-implementation-archetype</artifactId>

-    <packaging>maven-archetype</packaging>

-    <name>Create a Tuscany implementation extension project</name>

-    <description>Create a Tuscany implementation extension project</description>

-

-    <build>

-       <extensions>

-          <extension>

-             <groupId>org.apache.maven.archetype</groupId>

-             <artifactId>archetype-packaging</artifactId>

-             <version>2.0-alpha-5</version>

-          </extension>

-       </extensions>

-

-       <pluginManagement>

-          <plugins>

-             <plugin>

-                <artifactId>maven-archetype-plugin</artifactId>

-                <version>2.0-alpha-5</version>

-               <extensions>true</extensions>

-             </plugin>

-          </plugins>

-       </pluginManagement>

-    </build>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 8b1b08b4bb..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,61 +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 xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="tuscany-binding-foo-runtime"

-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-  <requiredProperties>

-    <requiredProperty key="implementationName">

-    </requiredProperty>

-  </requiredProperties>

-

-  <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>**/*.*</include>

-      </includes>

-    </fileSet>

-    <fileSet filtered="true" encoding="UTF-8">

-      <directory>src/test/java</directory>

-      <includes>

-        <include>**/*.java</include>

-      </includes>

-    </fileSet>

-    <fileSet filtered="true" encoding="UTF-8">

-      <directory>src/test/resources</directory>

-      <includes>

-        <include>**/*.*</include>

-      </includes>

-    </fileSet>

-    <fileSet filtered="true" encoding="UTF-8">

-      <directory>META-INF</directory>

-      <includes>

-        <include>MANIFEST.MF</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-</archetype-descriptor>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 5880433840..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA ${implementationName} Implementation

-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 ${implementationName} Binding

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.${artifactId}

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index d0a1a2aa17..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,59 +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-modules</artifactId>

-        <version>2.0.1</version>

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

-    </parent>

-

-    <artifactId>binding-${artifactId}</artifactId>

-    <groupId>${groupId}</groupId>

-    <version>${version}</version>

-    <name>Apache Tuscany SCA ${implementationName} Implementation Extension</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>2.0.1</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/__implementationName__Implementation.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/__implementationName__Implementation.java
deleted file mode 100644
index d9cbdb954d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/__implementationName__Implementation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.provider.BaseBindingImpl;

-

-/**

- * Represents a binding to a ${bindingName} service.

- */

-public class ${bindingName}Binding extends BaseBindingImpl {

-

-    public static final QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.${artifactId}");

-

-    private String someAttr;

-

-    public ${bindingName}Binding() {

-    }

-

-    public QName getType() {

-        return TYPE;

-    }

-    

-    public String getSomeAttr() {

-        return someAttr;

-    }

-

-    public void setSomeAttr(String someAttr) {

-        this.someAttr = someAttr;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/__implementationName__ImplementationFactory.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/__implementationName__ImplementationFactory.java
deleted file mode 100644
index ae1cd88745..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/__implementationName__ImplementationFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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};

-

-

-/**

- * Factory implementation to create ${bindingName} Models

- */

-public class ${bindingName}BindingFactory {

-

-    public ${bindingName}Binding create${bindingName}Binding() {

-        return new ${bindingName}Binding();

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__BindingProviderFactory.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__BindingProviderFactory.java
deleted file mode 100644
index 93c6bf3c04..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__BindingProviderFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import ${package}.${bindingName}Binding;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.provider.BindingProviderFactory;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;

-

-public class ${bindingName}BindingProviderFactory implements BindingProviderFactory<${bindingName}Binding> {

-

-    public ${bindingName}BindingProviderFactory(ExtensionPointRegistry extensionPoints) {

-    }

-

-    public Class<${bindingName}Binding> getModelType() {

-        return ${bindingName}Binding.class;

-    }

-

-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpoint) {

-        return new ${bindingName}ReferenceBindingProvider(endpoint);

-    }

-

-    public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {

-        return new ${bindingName}ServiceBindingProvider(endpoint);

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ReferenceBindingProvider.java
deleted file mode 100644
index dc2991014e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ReferenceBindingProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import org.apache.tuscany.sca.assembly.EndpointReference;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-

-public class ${bindingName}ReferenceBindingProvider implements ReferenceBindingProvider {

-

-    private EndpointReference endpoint;

-    private InterfaceContract contract;

-

-    public ${bindingName}ReferenceBindingProvider(EndpointReference endpoint) {

-        this.endpoint = endpoint;

-    }

-    

-    public Invoker createInvoker(Operation operation) {

-        return new ${bindingName}ReferenceInvoker(operation, endpoint);

-    }

-

-    public void start() {

-    }

-

-    public void stop() {

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return contract;

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ReferenceInvoker.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ReferenceInvoker.java
deleted file mode 100644
index d3e2bd1812..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ReferenceInvoker.java
+++ /dev/null
@@ -1,56 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import org.apache.tuscany.sca.assembly.EndpointReference;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-

-public class ${bindingName}ReferenceInvoker implements Invoker {

-    

-    protected Operation operation;

-    protected EndpointReference endpoint;

-

-    public ${bindingName}ReferenceInvoker(Operation operation, EndpointReference endpoint) {

-        this.operation = operation;

-        this.endpoint = endpoint;

-    }

-

-    public Message invoke(Message msg) {

-        try {

-

-            return doInvoke(msg);

-            

-        } catch (Exception e) {

-            throw new RuntimeException(e);

-        }

-    }

-

-    public Message doInvoke(Message msg) {

-        // Add some code here to make an invocation over the ${bindingName} binding protocol

-        // For this sample we'll just get it from the static stash

-        ${bindingName}ServiceInvoker fi = ${bindingName}Stash.getService(endpoint.getBinding().getURI());

-        return fi.invokeService(msg);

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ServiceBindingProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ServiceBindingProvider.java
deleted file mode 100644
index 59d41091d8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ServiceBindingProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import ${package}.${bindingName}Binding;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-

-public class ${bindingName}ServiceBindingProvider implements ServiceBindingProvider {

-

-    private RuntimeEndpoint endpoint;

-    private InterfaceContract contract;

-

-    public ${bindingName}ServiceBindingProvider(RuntimeEndpoint endpoint) {

-        this.endpoint = endpoint;

-    }

-

-    public void start() {

-        // add some code here to start the service

-

-        // For this sample we'll just share it in a static

-        ${bindingName}Stash.addService(endpoint.getBinding().getURI(), new ${bindingName}ServiceInvoker(endpoint));

-        

-        System.out.println("someAttr=" + ((${bindingName}Binding)endpoint.getBinding()).getSomeAttr());

-    }

-

-    public void stop() {

-        ${bindingName}Stash.removeService(endpoint.getBinding().getURI());

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return contract;

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ServiceInvoker.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ServiceInvoker.java
deleted file mode 100644
index 8ea20d41ed..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__ServiceInvoker.java
+++ /dev/null
@@ -1,43 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

-

-public class ${bindingName}ServiceInvoker {

-

-    private RuntimeEndpoint wire;

-    

-    public ${bindingName}ServiceInvoker(RuntimeEndpoint wire) {

-        this.wire = wire;

-    }

-

-    /**

-     * Send the request down the wire to invoke the service 

-     */

-    public Message invokeService(Message msg) {

-        return wire.invoke(msg);

-    }

-    

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__Stash.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__Stash.java
deleted file mode 100644
index 416a10e7b1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/java/runtime/__implementationName__Stash.java
+++ /dev/null
@@ -1,47 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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}.runtime;

-

-import java.util.HashMap;

-import java.util.Map;

-

-/**

- * Simplistic static Map to share service endpoints with references

- */

-public class ${bindingName}Stash {

-    

-    private static Map<String, ${bindingName}ServiceInvoker> services = new HashMap<String, ${bindingName}ServiceInvoker>();

-    

-    public static void addService(String uri, ${bindingName}ServiceInvoker ${bindingName}ServiceInvoker) {

-        services.put(uri, ${bindingName}ServiceInvoker);

-    }

-

-    public static ${bindingName}ServiceInvoker getService(String uri) {

-        return services.get(uri);

-    }

-

-    public static void removeService(String uri) {

-        services.remove(uri);

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory
deleted file mode 100644
index 3759b19fa0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for model factory

-${package}.${bindingName}BindingFactory

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index eb49133022..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.${artifactId},model=${package}.${bindingName}Binding,factory=${package}.${bindingName}BindingFactory

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index c33264f2a4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +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. 

-#

-binding-${artifactId}.xsd

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 3c0cfbc6d9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for the binding extension

-${package}.runtime.${bindingName}BindingProviderFactory;model=${package}.${bindingName}Binding

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/implementation-__artifactId__.xsd b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/implementation-__artifactId__.xsd
deleted file mode 100644
index d0c6f62439..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/main/resources/implementation-__artifactId__.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-#set( $implementationNameLC = ${implementationName} )<?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.    

--->

-<schema xmlns="http://www.w3.org/2001/XMLSchema" 

-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 

-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 

-    elementFormDefault="qualified">

-

-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" />

-

-    <element name="implementation.${artifactId}" type="t:${implementationName}Implementation" substitutionGroup="sca:implementation"/>

-    

-    <complexType name="${implementationName}Implementation">

-        <complexContent>

-            <extension base="sca:Implementation">

-                <attribute name="someAttr" type="string" use="optional"/>

-            </extension>

-        </complexContent>

-    </complexType>

-</schema>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index de982cefc1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 helloworld;

-

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClient implements HelloWorldService {

-

-    @Reference

-    public HelloWorldService  ref;

-    

-    public String sayHello(String name) {

-        return ref.sayHello(name);

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 521f6828ce..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 helloworld;

-

-

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String sayHello(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index eca0df1543..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloWorldService {

-

-    String sayHello(String name);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/test/__bindingName__BindingTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/test/__bindingName__BindingTestCase.java
deleted file mode 100644
index 61847e5eda..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/java/test/__bindingName__BindingTestCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*

- * 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 test;

-

-import helloworld.HelloWorldService;

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class ${bindingName}BindingTestCase {

-

-    private static Node node;

-    

-    @Test

-    public void testSayHello() {

-        HelloWorldService service = node.getService(HelloWorldService.class, "HelloWorldClient/HelloWorldService");

-        Assert.assertEquals("Hello boo", service.sayHello("boo"));

-    }

-

-    @BeforeClass

-    public static void init() throws Exception {

-        node = NodeFactory.newInstance().createNode("helloworld.composite").start();

-    }

-    

-    @AfterClass

-    public static void destroy() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/resources/helloworld.composite
deleted file mode 100644
index f0e6150c10..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/main/resources/archetype-resources/src/test/resources/helloworld.composite
+++ /dev/null
@@ -1,39 +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://itest"

-           name="HelloWorldComposite">

-           

-    <component name="HelloWorldComponent">

-        <implementation.java class="helloworld.HelloWorldImpl"/>

-        <service name="HelloWorldService" >

-            <tuscany:binding.${artifactId} someAttr="bla" />

-        </service>

-    </component>   

-  

-    <component name="HelloWorldClient">

-        <implementation.java class="helloworld.HelloWorldClient"/>

-        <reference name="ref" >

-            <tuscany:binding.${artifactId} uri="HelloWorldComponent/HelloWorldService"/>

-        </reference>

-    </component>   

-

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/test/resources/projects/basic/archetype.properties b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index a5eb1dd3d1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,23 +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. 

-#Sat Sep 04 08:10:22 BST 2010

-version=0.1-SNAPSHOT

-groupId=archetype.it

-package=archetype.it.basic

-artifactId=basic

-implementationName=Basic

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/pom.xml
deleted file mode 100644
index f856e72713..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/pom.xml
+++ /dev/null
@@ -1,67 +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/xsd/maven-4.0.0.xsd">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0.1</version>

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

-    </parent>

-

-  <artifactId>tuscany-policy-archetype</artifactId>

-  <packaging>maven-archetype</packaging>

-  <name>Create a Tuscany policy extension project</name>

-  <description>Create a Tuscany policy extension project</description>

-

-  <build>

-    <extensions>

-      <extension>

-        <groupId>org.apache.maven.archetype</groupId>

-        <artifactId>archetype-packaging</artifactId>

-        <version>2.2</version>

-      </extension>

-    </extensions>

-

-    <pluginManagement>

-      <plugins>

-        <plugin>

-          <artifactId>maven-archetype-plugin</artifactId>

-          <version>2.2</version>

-          <extensions>true</extensions>

-        </plugin>

-      </plugins>

-    </pluginManagement>

-  </build>

-

-  <distributionManagement>

-    <repository>

-      <id>apache.releases.https</id>

-      <name>Apache Release Distribution Repository</name>

-      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>

-    </repository>

-    <snapshotRepository>

-      <uniqueVersion>false</uniqueVersion>

-      <id>apache.snapshots.https</id>

-      <name>Apache Development Snapshot Repository</name>

-      <url>https://repository.apache.org/content/repositories/snapshots</url>

-    </snapshotRepository>

-  </distributionManagement>

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 1d260f241b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,70 +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 xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="tuscany-policy-logging"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <requiredProperties>
-    <requiredProperty key="policyName">
-    </requiredProperty>
-  </requiredProperties>
-
-  <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>**/*.*</include>
-      </includes>
-      <excludes>
-      	<exclude>**/definitions.xml</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/definitions.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/test/resources</directory>
-      <includes>
-        <include>**/*.*</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>META-INF</directory>
-      <includes>
-        <include>MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
deleted file mode 100644
index a41ac55cb6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Private-Package: org.apache.tuscany.sca.policy.logging;version="2.0.0",o
- rg.apache.tuscany.sca.policy.logging.jdk;version="2.0.0"
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany ${policyName} Policy Model
-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 ${policyName} Policy Model
-Import-Package: javax.xml.namespace,
- javax.xml.stream,
- org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.builder;version="2.0.0", 
- org.apache.tuscany.sca.contribution.processor;version="2.0.0",
- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
- org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.definitions;version="2.0.0",
- org.apache.tuscany.sca.interfacedef;version="2.0.0",
- org.apache.tuscany.sca.invocation;version="2.0.0",
- org.apache.tuscany.sca.monitor;version="2.0.0",
- org.apache.tuscany.sca.policy;version="2.0.0",
- org.apache.tuscany.sca.provider;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0",
- org.oasisopen.sca.annotation
-Bundle-SymbolicName: ${package}.${policyName}
-Bundle-DocURL: http://www.apache.org/
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 65bb4aa7db..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,43 +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-modules</artifactId>

-        <version>2.0.1</version>

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

-    </parent>

-    <groupId>${groupId}</groupId>

-    <artifactId>${artifactId}</artifactId>

-    <name>Apache Tuscany SCA Extension Policy ${policyName}</name>

-    <version>${version}</version>

-    

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <type>pom</type>

-            <scope>provided</scope>

-            <version>2.0.1</version>

-        </dependency>

-    </dependencies>

-    

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__Policy.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__Policy.java
deleted file mode 100644
index dec23b38f7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__Policy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName};
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}Policy {
-    static final String SCA11_NS = Base.SCA11_NS;
-    static final String SCA11_TUSCANY_NS = Base.SCA11_TUSCANY_NS;
-    
-    public static final QName POLICY_QNAME = new QName(SCA11_TUSCANY_NS, "${policyName}");
-
-    private String configProperty;
-
-    public String getConfigProperty() {
-        return configProperty;
-    }
-
-    public void setConfigProperty(String configProperty) {
-        this.configProperty = configProperty;
-    }
-
-    public QName getSchemaName() {
-        return POLICY_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    @Override
-    public String toString() {
-        return "${policyName}Policy [configProperty=" + configProperty
-            + "]";
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyBuilder.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyBuilder.java
deleted file mode 100644
index ef37957a62..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyBuilder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName};
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.builder.BuilderContext;
-import org.apache.tuscany.sca.assembly.builder.PolicyBuilder;
-import org.apache.tuscany.sca.policy.PolicyExpression;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySubject;
-
-/**
- * 
- */
-public class ${policyName}PolicyBuilder implements PolicyBuilder<${policyName}Policy> {
-
-	@Override
-    public boolean build(Endpoint endpoint, BuilderContext context) {
-        List<${policyName}Policy> polices = getPolicies(endpoint);
-        System.out.println(endpoint + ": " + polices);
-        return true;
-    }
-
-	@Override
-    public boolean build(EndpointReference endpointReference, BuilderContext context) {
-        List<${policyName}Policy> polices = getPolicies(endpointReference);
-        System.out.println(endpointReference + ": " + polices);
-        return true;
-    }
-
-	@Override
-    public boolean build(Component component, Implementation implementation, BuilderContext context) {
-        List<${policyName}Policy> polices = getPolicies(implementation);
-        System.out.println(implementation + ": " + polices);
-        return true;
-    }
-
-	@Override
-    public QName getPolicyType() {
-        return ${policyName}Policy.POLICY_QNAME;
-    }
-	
-	@Override
-    public List<QName> getSupportedBindings() {
-        return null;
-    }
-
-    private List<${policyName}Policy> getPolicies(PolicySubject subject) {
-        List<${policyName}Policy> polices = new ArrayList<${policyName}Policy>();
-        for (PolicySet ps : subject.getPolicySets()) {
-            for (PolicyExpression exp : ps.getPolicies()) {
-                if (getPolicyType().equals(exp.getName())) {
-                    polices.add((${policyName}Policy)exp.getPolicy());
-                }
-            }
-        }
-        return polices;
-    }
-
-    @Override
-    public boolean build(EndpointReference endpointReference, Endpoint endpoint, BuilderContext context) {
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyFactory.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyFactory.java
deleted file mode 100644
index d3d760531d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName};
-
-/**
- * Factory for ${policyName} Policy
- * 
- * @version $Rev$ $Date$
- */
-public interface ${policyName}PolicyFactory {
-
-
-    /**
-     * Creates a new ${policyName} Policy
-     * @return the new ${policyName} policy
-     */
-	${policyName}Policy create${policyName}Policy();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyProcessor.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyProcessor.java
deleted file mode 100644
index 2a1313a115..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/__policyName__PolicyProcessor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName};
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- *
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}PolicyProcessor implements StAXArtifactProcessor<${policyName}Policy> {
-	
-    public ${policyName}PolicyProcessor(FactoryExtensionPoint modelFactories) {
-    }
-
-    @Override
-    public QName getArtifactType() {
-        return ${policyName}Policy.POLICY_QNAME;
-    }
-    
-    @Override
-    public ${policyName}Policy read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
-        ${policyName}Policy policy = new ${policyName}Policy();
-        int event = reader.getEventType();
-        QName name = null;
-        
-        
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( name.equals(${policyName}Policy.POLICY_QNAME) ) {
-                        String config = reader.getAttributeValue(null, "name");
-                        policy.setConfigProperty(config);
-                    }
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( ${policyName}Policy.POLICY_QNAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    @Override
-    public void write(${policyName}Policy policy, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException,
-                                                        XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-        						 ${policyName}Policy.POLICY_QNAME.getLocalPart(),
-        						 ${policyName}Policy.POLICY_QNAME.getNamespaceURI());
-        writer.writeNamespace("tuscany", ${policyName}Policy.SCA11_TUSCANY_NS);
-        
-        if (policy.getConfigProperty() != null) {
-            writer.writeAttribute("name", policy.getConfigProperty());
-        }
-        
-        writer.writeEndElement();
-    }
-
-    @Override
-    public Class<${policyName}Policy> getModelType() {
-        return ${policyName}Policy.class;
-    }
-
-    @Override
-    public void resolve(${policyName}Policy arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ImplementationPolicyProvider.java
deleted file mode 100644
index 129f0add6c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ImplementationPolicyProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName}.provider;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.invocation.PhasedInterceptor;
-import org.apache.tuscany.sca.provider.BasePolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import ${package}.util.PolicyHelper;
-import ${package}.${policyName}.${policyName}Policy;
-
-/**
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}ImplementationPolicyProvider extends BasePolicyProvider<${policyName}Policy> {
-    private RuntimeComponent component;
-    
-    public ${policyName}ImplementationPolicyProvider(RuntimeComponent component) {
-        super(${policyName}Policy.class, component.getImplementation());
-        this.component = component;
-    }
-
-    /**
-     * @see ${groupId}.provider.PolicyProvider${symbol_pound}createInterceptor(${groupId}.interfacedef.Operation)
-     */
-    @Override
-    public PhasedInterceptor createInterceptor(Operation operation) {
-        List<PolicySet> policySets = PolicyHelper.findPolicySets(component, ${policyName}Policy.POLICY_QNAME);
-        
-        
-        return policySets.isEmpty() ? null : new ${policyName}PolicyInterceptor(getContext(), operation, getPhase());
-    }
-    
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__PolicyInterceptor.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__PolicyInterceptor.java
deleted file mode 100644
index 164d59be90..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__PolicyInterceptor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName}.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.PhasedInterceptor;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.1/impl/java}${policyName}Policy
- *
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}PolicyInterceptor implements PhasedInterceptor {
-    private Invoker next;
-    private Operation operation;
-    private String context;
-    private String phase;
-    
-    public ${policyName}PolicyInterceptor(String context, Operation operation, String phase) {
-        super();
-        this.operation = operation;
-        this.context = context;
-        this.phase = phase;
-    }
-
-    @Override
-    public Message invoke(Message msg) {
-        // DO SOMETHING HERE
-        System.out.println("Inside policy interceptor invoke method");
-        
-        return getNext().invoke(msg);
-    }
-
-    @Override
-    public Invoker getNext() {
-        return next;
-    }
-
-    @Override
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    @Override
-    public String getPhase() {
-        return phase;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__PolicyProviderFactory.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__PolicyProviderFactory.java
deleted file mode 100644
index 44c962bc2c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__PolicyProviderFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName}.provider;
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import ${package}.${policyName}.${policyName}Policy;
-
-/**
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}PolicyProviderFactory implements PolicyProviderFactory<${policyName}Policy> {
-    private ExtensionPointRegistry registry;
-    
-    public ${policyName}PolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     * @see ${groupId}.provider.PolicyProviderFactory${symbol_pound}createImplementationPolicyProvider(${groupId}.runtime.RuntimeComponent, ${groupId}.assembly.Implementation)
-     */
-    @Override
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component) {
-        return new ${policyName}ImplementationPolicyProvider(component);
-    }
-
-    /**
-     * @see ${groupId}.provider.PolicyProviderFactory${symbol_pound}createReferencePolicyProvider(${groupId}.runtime.RuntimeComponent, ${groupId}.runtime.RuntimeComponentReference, ${groupId}.assembly.Binding)
-     */
-    @Override
-    public PolicyProvider createReferencePolicyProvider(EndpointReference endpointReference) {
-        return new ${policyName}ReferencePolicyProvider(endpointReference);
-    }
-
-    /**
-     * @see ${groupId}.provider.PolicyProviderFactory${symbol_pound}createServicePolicyProvider(${groupId}.runtime.RuntimeComponent, ${groupId}.runtime.RuntimeComponentService, ${groupId}.assembly.Binding)
-     */
-    @Override
-    public PolicyProvider createServicePolicyProvider(Endpoint endpoint) {
-        return new ${policyName}ServicePolicyProvider(endpoint);
-    }
-
-    /**
-     * @see ${groupId}.provider.ProviderFactory${symbol_pound}getModelType()
-     */
-    @Override
-    public Class<${policyName}Policy> getModelType() {
-        return ${policyName}Policy.class;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ReferencePolicyProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ReferencePolicyProvider.java
deleted file mode 100644
index 70ea13de2f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ReferencePolicyProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName}.provider;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.invocation.PhasedInterceptor;
-import org.apache.tuscany.sca.provider.BasePolicyProvider;
-
-import ${package}.util.PolicyHelper;
-import ${package}.${policyName}.${policyName}Policy;
-/**
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}ReferencePolicyProvider extends BasePolicyProvider<${policyName}Policy> {
-    private EndpointReference endpointReference;
-    
-    public ${policyName}ReferencePolicyProvider(EndpointReference endpointReference) {
-        super(${policyName}Policy.class, endpointReference);
-        this.endpointReference = endpointReference;
-    }
-
-    @Override
-    public PhasedInterceptor createInterceptor(Operation operation) {
-        List<PolicySet> policySets = PolicyHelper.findPolicySets(endpointReference, ${policyName}Policy.POLICY_QNAME);
-
-        return (policySets.isEmpty()) ? null : new ${policyName}PolicyInterceptor(getContext(), operation, Phase.REFERENCE_POLICY);
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ServicePolicyProvider.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ServicePolicyProvider.java
deleted file mode 100644
index cb23eb6dad..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/__policyName__/provider/__policyName__ServicePolicyProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.${policyName}.provider;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.invocation.PhasedInterceptor;
-import org.apache.tuscany.sca.provider.BasePolicyProvider;
-
-import ${package}.util.PolicyHelper;
-import ${package}.${policyName}.${policyName}Policy;
-
-/**
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class ${policyName}ServicePolicyProvider extends BasePolicyProvider<${policyName}Policy> {
-    private Endpoint endpoint;
-    
-    public ${policyName}ServicePolicyProvider(Endpoint endpoint) {
-        super(${policyName}Policy.class, endpoint);
-        this.endpoint = endpoint;
-    }
-
-    @Override
-    public PhasedInterceptor createInterceptor(Operation operation) {
-        List<PolicySet> policySets = PolicyHelper.findPolicySets(endpoint, ${policyName}Policy.POLICY_QNAME);
-        
-        return policySets.isEmpty() ? null : new ${policyName}PolicyInterceptor(getContext(), operation, Phase.SERVICE_POLICY);
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/util/PolicyHelper.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/util/PolicyHelper.java
deleted file mode 100644
index 2f21ae2e4b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/java/util/PolicyHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyExpression;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySubject;
-
-public class PolicyHelper {
-
-    /**
-     * Find a list of policy sets that provide the given intent
-     * @param subject
-     * @param providedIntent
-     * @return
-     */
-    public static List<PolicySet> findPolicySets(PolicySubject subject, QName providedIntent) {
-        List<PolicySet> policies = new ArrayList<PolicySet>();
-        List<PolicySet> policySets = subject.getPolicySets();
-        for (PolicySet ps : policySets) {
-            for (Intent i : ps.getProvidedIntents()) {
-                if (i.getName().equals(providedIntent)) {
-                    policies.add(ps);
-                }
-            }
-        }
-        return policies;
-    }
-
-    /**
-     * Find a list of policies of the given type
-     * @param <T>
-     * @param subject
-     * @param policyType
-     * @return
-     */
-    public static <T> List<T> findPolicies(PolicySubject subject, QName providedIntent, Class<T> policyType) {
-        List<T> policies = new ArrayList<T>();
-        List<PolicySet> policySets = findPolicySets(subject, providedIntent);
-        for (PolicySet ps : policySets) {
-            for (PolicyExpression exp : ps.getPolicies()) {
-                if (policyType.isInstance(exp.getPolicy())) {
-                    policies.add(policyType.cast(exp.getPolicy()));
-                }
-            }
-        }
-        return policies;
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
deleted file mode 100644
index 26ca8d5fdf..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
+++ /dev/null
@@ -1,17 +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}.${policyName}.${policyName}PolicyBuilder;qname=http://tuscany.apache.org/xmlns/sca/1.1#${policyName}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 9b97157f57..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-${package}.${policyName}.${policyName}PolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#${policyName}Policy,model=${package}.${policyName}.${policyName}Policy
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
deleted file mode 100644
index a186ac7367..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ /dev/null
@@ -1,17 +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.
-${policyName}/definitions.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index 4d41d2281c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the policy extension
-${package}.${policyName}.provider.${policyName}PolicyProviderFactory;model=${package}.${policyName}.${policyName}Policy
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/__policyName__/definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/__policyName__/definitions.xml
deleted file mode 100644
index a956d3417f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/__policyName__/definitions.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-	<!-- Policy Intents Defined by the SCA Runtime -->
-	<intent name="${policyName}" constrains="implementation binding">
-		<description>
-			All operations should have a valid authenticated user
-		</description>
-	</intent>
-
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/definitions.xml
deleted file mode 100644
index 4e24d0e93b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-	<!-- Policy Intents Defined by the Tuscany Runtime -->
-	<intent name="logging" constrains="implementation binding">
-		<description>
-			All messages to and from this implementation must be logged
-		</description>
-	</intent>
-    
-    <!-- Policy Intents Defined by the Tuscany Runtime -->
-    <intent name="noLogging" constrains="implementation binding" excludes="tuscany:logging">
-        <description>
-            All messages to and from this implementation must be logged
-        </description>
-    </intent>
-    
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/java/PolicyReadTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/java/PolicyReadTestCase.java
deleted file mode 100644
index 436c429aad..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/java/PolicyReadTestCase.java
+++ /dev/null
@@ -1,87 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.    
- */
-
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-
-import ${package}.${policyName}.${policyName}Policy;
-import ${package}.${policyName}.${policyName}PolicyProcessor;
-
-/**
- * Test the reading of ws config params policy.
- *
- * @version ${symbol_dollar}Rev${symbol_dollar} ${symbol_dollar}Date${symbol_dollar}
- */
-public class PolicyReadTestCase extends TestCase {
-    private ProcessorContext context = new ProcessorContext();
-    
-    @Override
-    public void setUp() throws Exception {
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    public void testPolicyReading() throws Exception { 
-    	${policyName}PolicyProcessor processor = new ${policyName}PolicyProcessor(null);
-//      URL url = getClass().getResource("mock_policies.xml");
-//      XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-//      
-//      InputStream urlStream = url.openStream();
-//      XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
-//      
-//      
-//      ${policyName}Policy policy = processor.read(reader, context);
-    }
-    
-    public void testPolicyWriting() throws Exception {
-    	${policyName}PolicyProcessor processor = new ${policyName}PolicyProcessor(null);
-        
-    	${policyName}Policy policy = new ${policyName}Policy();
-        
-        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);
-        processor.write(policy, writer, context);
-        writer.close();
-        
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        StringReader sr = new StringReader(sw.toString());
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(sr);
-        
-        policy = processor.read(reader, context);
-        
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/resources/mock_policies.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/resources/mock_policies.xml
deleted file mode 100644
index a6071984e8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/resources/mock_policies.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<tuscany:${policyName} xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" name="test.${policyName}">
-	
-</tuscany:${policyName}>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
deleted file mode 100644
index 956e2d763d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/main/resources/archetype-resources/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ /dev/null
@@ -1,19 +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.    

--->

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/test/resources/projects/basic/archetype.properties b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 6e140b54b7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,22 +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. 
-#Sat Sep 04 08:10:22 BST 2010
-version=0.1-SNAPSHOT
-groupId=archetype.it
-package=archetype.it.basic
-artifactId=basic
-policyName=Basic
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/test/resources/projects/basic/goal.txt b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/policy/src/test/resources/projects/basic/goal.txt
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/pom.xml
deleted file mode 100644
index 7498c05665..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/pom.xml
+++ /dev/null
@@ -1,53 +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.1</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-archetype</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Maven Archetypes</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>binding</module>
-                <module>contribution-jar</module>
-                <module>contribution-zip</module>
-                <module>contribution-zip-discriptor</module>
-                <module>policy</module>
-                <module>quickstart</module>
-                <module>quickstart-jsf</module>
-                <module>quickstart-stripes</module>
-                <module>quickstart-bpel</module>
-            </modules>
-        </profile>
-    </profiles>    
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
deleted file mode 100644
index 29e03eb396..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Name: Apache Tuscany SCA Quickstart Archetype

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

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

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

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/pom.xml
deleted file mode 100644
index ded038eab3..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-quickstart-bpel</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create an SCA Webapp project using BPEL</name>
-    <description>Create an SCA Webapp project using BPEL</description>
-
-    <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-    <plugins>
-      <plugin>
-        <artifactId>maven-archetype-plugin</artifactId>
-        <version>2.2</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 47c2f5dc10..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,43 +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" packaged="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*</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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index c466a1b3f5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,33 +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>
-    <source>src/main/resources/helloworld.bpel</source>
-    <source>src/main/resources/helloworld.wsdl</source>
-    <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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 9584cf7c6e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,182 +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>${project.artifactId}</artifactId>
-	<packaging>war</packaging>
-	<version>${project.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>
-
-            <dependency>
-               <groupId>org.apache.tuscany.sca</groupId>
-               <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-               <version>${tuscany.version}</version>
-               <scope>runtime</scope>
-            </dependency>
-
-		<!--  JUNIT DEPENDENCY FOR TESTING -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</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>${project.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>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-dependency-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>unpack</id>
-             <phase>compile</phase>
-             <goals>
-               <goal>unpack</goal>
-             </goals>
-             <configuration>
-               <artifactItems>
-                 <artifactItem>
-                   <groupId>org.apache.ode</groupId>
-                   <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-                   <version>1.1.1</version>
-                   <type>zip</type>
-                   <overWrite>false</overWrite>
-                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                   <includes>**/*</includes>
-                 </artifactItem>
-               </artifactItems>
-              </configuration>
-           </execution>
-         </executions>
-       </plugin>
-			<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>
-                        <version>${jetty.version}</version>
-                        <configuration>
-                           <systemProperties>
-                              <systemProperty>
-                                 <!-- this property is needed to avoid a problem in openjpa -->
-                                 <name>openjpa.QueryCompilationCache</name>
-                                 <value>false</value>
-                              </systemProperty>
-                           </systemProperties>
-                           <!-- need to override the src dir so src/main/resources are also included -->
-                           <webAppSourceDirectory>${basedir}/src/main</webAppSourceDirectory>
-                           <webXml>${basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                        </configuration>
-			</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</tuscany.version>
-		<jetty.version>6.1.18</jetty.version>
-	</properties>
-	#end
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
deleted file mode 100644
index a99cc7b032..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/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 hello(String name);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
deleted file mode 100644
index 53e77c5be0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.

-  -->

-<process name="HelloWorld"

-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"

-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">

-

-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"

-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>

-

-   <partnerLinks>

-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />

-   </partnerLinks>

-    

-   <variables>

-     <variable name="myVar" messageType="test:HelloMessage"/>

-     <variable name="tmpVar" type="xsd:string"/>

-   </variables>

-

-   <sequence>

-       <receive

-          name="start"

-          partnerLink="helloPartnerLink"

-          portType="test:HelloPortType"

-          operation="hello"

-          variable="myVar"

-          createInstance="yes"/>

-

-      <assign name="assign1">

-          <copy>

-              <from variable="myVar" part="TestPart"/>

-              <to variable="tmpVar"/>

-          </copy>

-          <copy>

-              <from>concat($tmpVar,' World')</from>

-              <to variable="myVar" part="TestPart"/>

-          </copy>

-      </assign>

-       <reply name="end"  

-              partnerLink="helloPartnerLink"

-              portType="test:HelloPortType" 

-              operation="hello"

-              variable="myVar"/>

-   </sequence>

-</process>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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.
-  -->
-
-<wsdl:definitions 
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 4d3d532184..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-           targetNamespace="http://${package}"
-           name="${artifactId}">
-
-    <component name="WebComponent">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent">
-            <interface.java interface="${package}.HelloworldService"/>
-        </reference>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 922d275b17..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
deleted file mode 100644
index 7aeaf81b33..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-bpel/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.hello("world") %>

-

-  </body>

-</html>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/pom.xml
deleted file mode 100644
index 87a94f2756..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-quickstart-jsf</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create a Tuscany SCA and JSF project</name>
-    <description>Create a Tuscany SCA and JSF project</description>
-
-    <build>
-       <extensions>
-          <extension>
-             <groupId>org.apache.maven.archetype</groupId>
-             <artifactId>archetype-packaging</artifactId>
-             <version>2.2</version>
-          </extension>
-       </extensions>
-       <plugins>
-          <plugin>
-             <artifactId>maven-archetype-plugin</artifactId>
-             <version>2.2</version>
-             <extensions>true</extensions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index f15a12fb88..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,44 +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>**/*.html</include>
-        <include>**/*.composite</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index b5295d8a73..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,38 +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>quickstart-stripes</id>
-  <sources>
-    <source>src/main/java/sample/stripes/action/BaseActionBean.java</source>
-    <source>src/main/java/sample/stripes/action/HomeActionBean.java</source>
-    <source>src/main/java/sample/sca/HelloworldService.java</source>
-    <source>src/main/java/sample/sca/HelloworldServiceImpl.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/resources/log4j.properties</resource>
-    <resource>src/main/resources/StripesResources.properties</resource>
-    <resource>src/main/webapp/index.html</resource>
-    <resource>src/main/webapp/WEB-INF/jsp/home.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/jsp/layout.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/jsp/taglibs.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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 71503067b1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,154 +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>${project.artifactId}</artifactId>
-	<packaging>war</packaging>
-	<version>${project.version}</version>
-	#literal()<!-- TODO project name  -->
-	<name>quickstart-jsf</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-myfaces</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <!--  MyFaces JSF dependencies -->
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk</artifactId>
-            <version>1.1.6</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jstl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-	<build>
-            <defaultGoal>install</defaultGoal>
-            <finalName>${project.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>
-                        <version>${jetty.version}</version>
-			</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</tuscany.version>
-		<myfaces.version>1.5</myfaces.version>
-		<jetty.version>6.1.4</jetty.version>
- 	</properties>
-	#end
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
deleted file mode 100644
index e38c84feda..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.myfaces;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import ${package}.sca.HelloworldService;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- * 
- */
-public class HelloWorldController {
-
-    //properties
-    private String name;
-
-    @Reference
-    private HelloworldService service;
-    
-    /**
-     * default empty constructor
-     */
-    public HelloWorldController(){
-    }
-    
-    //-------------------getter & setter
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * Method that is backed to a submit button of a form.
-     */
-    public String send(){
-
-        // invoke the SCA reference	
-        name = service.sayHello(name);
-
-        return "success";
-    }
-}
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
deleted file mode 100644
index d6cb7bbcf2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.sca;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
deleted file mode 100644
index ec9bfd7221..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.sca;
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 3b732de8af..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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.    
--->
-<faces-config version="1.2" 
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-	
-	<!-- managed beans of the simple hello world app -->
-	<managed-bean>
-		<managed-bean-name>helloWorld</managed-bean-name>
-		<managed-bean-class>${package}.myfaces.HelloWorldController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	
-	<!-- navigation rules for helloWorld.jsp -->
-	<navigation-rule>
-		<from-view-id>/helloWorld.jsp</from-view-id>
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/page2.jsp</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	
-	<!-- navigation rules for page2.jsp -->
-	<navigation-rule>
-		<from-view-id>/page2.jsp</from-view-id>
-		<navigation-case>
-			<from-outcome>back</from-outcome>
-			<to-view-id>/helloWorld.jsp</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-</faces-config>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 7e18dc9308..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,35 +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://${package}"
-           name="${artifactId}">
-
-    <component name="${artifactId}WebComponent">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="${package}.sca.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 48b73fe68a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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 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"
-         version="2.4">
-
-    <display-name>${artifactId}</display-name>
-
-    <!-- The only web.xml change to the MyFaces Helloworld sample is to add
-         the Tuscany listener and annotation processor context parameter -->
-    <listener>
-       <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-    <context-param>
-        <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name>
-        <param-value>org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider</param-value>
-    </context-param>
-
-    <!--optional: context-param>
-        <description>Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
-        </description>
-        <param-name>javax.faces.CONFIG_FILES</param-name>
-        <param-value>/WEB-INF/examples-config.xml</param-value>
-    </context-param-->
-    <context-param>
-        <description>State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.3</description>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default).
-            Defines the amount (default = 20) of the latest views are stored in session.</description>
-        <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
-        <param-value>20</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default).
-            If true (default) the state will be serialized to a byte stream before it
-            is written to the session.
-            If false the state will not be serialized to a byte stream.</description>
-        <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default) and if
-            org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default)
-            If true (default) the serialized state will be compressed before it
-            is written to the session. If false the state will not be compressed.</description>
-        <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "true"</description>
-        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>If true, rendered HTML code will be formatted, so that it is "human readable".
-            i.e. additional line separators and whitespace will be written, that do not
-            influence the HTML code.
-            Default: "true"</description>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>If true, a javascript function will be rendered that is able to restore the
-            former vertical scroll on every request. Convenient feature if you have pages
-            with long lists and you do not want the browser page to always jump to the top
-            if you trigger a link or button action that stays on the same page.
-            Default: "false"</description>
-        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <description>Used for encrypting view state. Only relevant for client side
-            state saving. See MyFaces wiki/web site documentation for instructions
-            on how to configure an application for diffenent encryption strengths.
-        </description>
-        <param-name>org.apache.myfaces.SECRET</param-name>
-        <param-value>NzY1NDMyMTA=</param-value>
-    </context-param>
-
-    <context-param>
-        <description>
-            Validate managed beans, navigation rules and ensure that forms are not nested.
-        </description>
-        <param-name>org.apache.myfaces.VALIDATE</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    
-    <context-param>
-        <description>
-            Treat readonly same as if disabled attribute was set for select elements.
-        </description>
-        <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name>
-        <param-value>true</param-value>
-    </context-param>    
-    
-    <context-param>
-        <description>
-            Use the defined class as the class which will be called when a resource is added to the
-            ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add
-            custom components and want to use the ExtensionFilter, you need to provide your custom implementation here.
-        </description>
-        <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
-        <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value>
-    </context-param>        
-
-    <context-param>
-        <description>
-            Virtual path in the URL which triggers loading of resources for the MyFaces extended components
-            in the ExtensionFilter.
-        </description>
-        <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name>
-        <param-value>/faces/myFacesExtensionResource</param-value>
-    </context-param>
-    
-    <context-param>
-        <description>
-            Check if the extensions-filter has been properly configured.
-        </description>
-        <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
-        <param-value>true</param-value>
-    </context-param>    
-
-    <context-param>
-        <description>
-            Define partial state saving as true/false.
-        </description>
-        <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
-        <param-value>false</param-value>
-    </context-param>    
-
-    <!-- Extensions Filter -->
-    <filter>
-        <filter-name>extensionsFilter</filter-name>
-        <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
-        <init-param>
-            <description>Set the size limit for uploaded files.
-                Format: 10 - 10 bytes
-                10k - 10 KB
-                10m - 10 MB
-                1g - 1 GB</description>
-            <param-name>uploadMaxFileSize</param-name>
-            <param-value>100m</param-value>
-        </init-param>
-        <init-param>
-            <description>Set the threshold size - files
-                below this limit are stored in memory, files above
-                this limit are stored on disk.
-
-                Format: 10 - 10 bytes
-                10k - 10 KB
-                10m - 10 MB
-                1g - 1 GB</description>
-            <param-name>uploadThresholdSize</param-name>
-            <param-value>100k</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>extensionsFilter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>extensionsFilter</filter-name>
-        <url-pattern>/faces/*</url-pattern>
-    </filter-mapping>
-
-    <!-- Listener, to allow Jetty serving MyFaces apps -->
-    <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-    </listener>
-
-    <!-- Faces Servlet -->
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Faces Servlet Mapping -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-    <!-- Welcome files -->
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
deleted file mode 100644
index 4a3197ec4f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.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.    

--->

-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>

-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>

-<html>

-    <head>

-        <title>Hello World</title>

-    </head>

-    <body>

-        <f:view>

-            <h:form id="mainForm">

-              <h:panelGrid columns="2">

-                <h:outputLabel for="name" value="Please enter your name" />

-                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>

-                <h:commandButton value="Press me" action="#{helloWorld.send}"/>

-                <h:messages showDetail="true" showSummary="false"/>

-              </h:panelGrid>

-            </h:form>

-        </f:view>

-    </body>

-</html>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index 768aa2408b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,22 +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 session="false"%>

-<%

-response.sendRedirect("helloWorld.jsf");

-%>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
deleted file mode 100644
index 1c096f66c6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ /dev/null
@@ -1,35 +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.    

--->

-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>

-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>

-<html>

-    <head>

-        <title>Hello World</title>

-    </head>

-    <body>

-        <f:view>

-            <h:form id="mainForm">

-                <h2><h:outputText value="#{helloWorld.name}. We hope you enjoy SCA and JSF with Apache Tuscany and MyFaces"/></h2>

-                <h:commandLink action="back">

-                    <h:outputText value="Home"/>

-                </h:commandLink>

-            </h:form>

-        </f:view>

-    </body>

-</html>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
deleted file mode 100644
index 29e03eb396..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Name: Apache Tuscany SCA Quickstart Archetype

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

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

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

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/pom.xml
deleted file mode 100644
index 60b6496e59..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>

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

-    </parent>

-

-    <artifactId>tuscany-quickstart-jsonp</artifactId>

-    <packaging>maven-archetype</packaging>

-    <name>Create a Tuscany SCA webapp project using the JSONP binding</name>

-    <description>Create a Tuscany SCA webapp project using the JSONP binding</description>

-

-    <build>

-    <extensions>

-      <extension>

-        <groupId>org.apache.maven.archetype</groupId>

-        <artifactId>archetype-packaging</artifactId>

-        <version>2.0-alpha-4</version>

-      </extension>

-    </extensions>

-    <plugins>

-      <plugin>

-        <artifactId>maven-archetype-plugin</artifactId>

-        <version>2.0-alpha-4</version>

-        <extensions>true</extensions>

-      </plugin>

-    </plugins>

-  </build>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 450e33afd5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,42 +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">

-  <requiredProperties>

-    <requiredProperty key="includeTuscanyRuntime">

-       <defaultValue>Y</defaultValue>

-    </requiredProperty>

-  </requiredProperties>

-  <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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 1bf4353502..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index b9b56b7799..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,154 +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>${project.artifactId}</artifactId>

-	<packaging>war</packaging>

-	<version>${project.version}</version>

-	<name>quickstart-jsonp</name>

-

-	<dependencies>

-		<!--  TUSCANY DEPENDENCIES -->

-            <dependency>

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

-               <artifactId>tuscany-sca-api</artifactId>

-               <version>${tuscany.version}</version>

-#if(${includeTuscanyRuntime} == "Y")

-               <scope>compile</scope>

-#else

-               <scope>provided</scope>

-#end

-            </dependency>

-

-            <dependency>

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

-               <artifactId>tuscany-implementation-web-runtime</artifactId>

-               <version>${tuscany.version}</version>

-#if( $includeTuscanyRuntime == "Y")

-               <scope>runtime</scope>

-#else

-               <scope>provided</scope>

-#end

-            </dependency>

-

-            <dependency>

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

-               <artifactId>tuscany-binding-jsonp-runtime</artifactId>

-               <version>${tuscany.version}</version>

-#if( $includeTuscanyRuntime == "Y")

-               <scope>runtime</scope>

-#else

-               <scope>provided</scope>

-#end

-            </dependency>

-

-		<!--  JUNIT DEPENDENCY FOR TESTING -->

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.8.1</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>${project.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>

-                        <version>${jetty.version}</version>

-			</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</tuscany.version>

-		<jetty.version>6.1.18</jetty.version>

-	</properties>

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
deleted file mode 100644
index 2491816adc..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
deleted file mode 100644
index 3527edcd6f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index fa37fec88c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,32 +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://${package}"

-           name="${artifactId}">

-

-    <component name="HelloworldComponent">

-        <implementation.java class="${package}.HelloworldImpl"/>

-        <service name="HelloworldService">

-           <tuscany:binding.jsonp/>

-        </service>

-    </component>

-

-</composite>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 25d8d8184d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,43 +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>

-

-#if($includeTuscanyRuntime == "Y")

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

-

-#end

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
deleted file mode 100644
index 9729ca6823..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-jsonp/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>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
deleted file mode 100644
index ae84237c4a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Name: Apache Tuscany SCA Quickstart Stripes Archetype

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

-Bundle-SymbolicName: org.apache.tuscany.sca.archetype.quickstart.stripes 

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

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

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/pom.xml
deleted file mode 100644
index fa1f29bf70..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-quickstart-stripes</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create a simple Apache Tuscany SCA webapp project using the Stripes Web Framework</name>
-    <description>Create a simple Apache Tuscany SCA webapp project using the Stripes Web Framework</description>
-
-    <build>
-       <extensions>
-          <extension>
-             <groupId>org.apache.maven.archetype</groupId>
-             <artifactId>archetype-packaging</artifactId>
-             <version>2.2</version>
-          </extension>
-       </extensions>
-       <plugins>
-          <plugin>
-             <artifactId>maven-archetype-plugin</artifactId>
-             <version>2.2</version>
-             <extensions>true</extensions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index f15a12fb88..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,44 +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>**/*.html</include>
-        <include>**/*.composite</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index b5295d8a73..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,38 +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>quickstart-stripes</id>
-  <sources>
-    <source>src/main/java/sample/stripes/action/BaseActionBean.java</source>
-    <source>src/main/java/sample/stripes/action/HomeActionBean.java</source>
-    <source>src/main/java/sample/sca/HelloworldService.java</source>
-    <source>src/main/java/sample/sca/HelloworldServiceImpl.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/resources/log4j.properties</resource>
-    <resource>src/main/resources/StripesResources.properties</resource>
-    <resource>src/main/webapp/index.html</resource>
-    <resource>src/main/webapp/WEB-INF/jsp/home.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/jsp/layout.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/jsp/taglibs.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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index b7aa9d678c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,124 +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>${project.artifactId}</artifactId>
-	<packaging>war</packaging>
-	<version>${project.version}</version>
-	#literal()<!-- TODO project name  -->
-	<name>quickstart-stripes</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-stripes</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <!--  Stripes Framework dependencies -->
-        <dependency>
-            <groupId>net.sourceforge.stripes</groupId>
-            <artifactId>stripes</artifactId>
-            <version>${stripes.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-
-    </dependencies>
-
-	<build>
-            <defaultGoal>install</defaultGoal>
-            <finalName>${project.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>
-                        <version>${jetty.version}</version>
-			</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</tuscany.version>
-		<stripes.version>1.5.2</stripes.version>
-		<jetty.version>6.1.4</jetty.version>
-	</properties>
-	#end
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
deleted file mode 100644
index d6cb7bbcf2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.sca;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
deleted file mode 100644
index 390b424d24..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.sca;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
deleted file mode 100644
index 5bfa1c5d32..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.stripes.action;
-
-import net.sourceforge.stripes.action.ActionBean;
-import net.sourceforge.stripes.action.ActionBeanContext;
-
-public class BaseActionBean implements ActionBean {
-    private ActionBeanContext context;
-
-    public ActionBeanContext getContext() {
-        return context;
-    }
-    public void setContext(ActionBeanContext context) {
-        this.context = context;
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
deleted file mode 100644
index 05fd743841..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
+++ /dev/null
@@ -1,48 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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}.stripes.action;
-
-import net.sourceforge.stripes.action.DefaultHandler;
-import net.sourceforge.stripes.action.ForwardResolution;
-import net.sourceforge.stripes.action.Resolution;
-import net.sourceforge.stripes.action.UrlBinding;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import ${package}.sca.HelloworldService;
-
-@UrlBinding("/Home.htm")
-public class HomeActionBean extends BaseActionBean {
-
-    @Reference
-    HelloworldService service;
-
-    @DefaultHandler
-    public Resolution view() {
-        return new ForwardResolution("/WEB-INF/jsp/home.jsp");
-    }
-
-    public String getHello() {
-        return service.sayHello("world");
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
deleted file mode 100644
index 6567f21ce1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
+++ /dev/null
@@ -1,77 +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.
-#
-
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-
-${symbol_pound} Resource strings used by the <stripes:errors> tag when there are no nested tags
-stripes.errors.header=<div style="color:${symbol_pound}b72222; font-weight: bold">Please fix the following errors:</div><ol>
-stripes.errors.beforeError=<li style="color: ${symbol_pound}b72222;">
-stripes.errors.afterError=</li>
-stripes.errors.footer=</ol>
-
-${symbol_pound} Resource strings used by the <stripes:errors> tag when displaying errors for a
-${symbol_pound} specific field (e.g. <stripes:errors field="password"/>). If not supplied the
-${symbol_pound} values above will be used instead.
-stripes.fieldErrors.header=
-stripes.fieldErrors.beforeError=<span style="color: ${symbol_pound}b72222;">
-stripes.fieldErrors.afterError=</span><br />
-stripes.fieldErrors.footer=
-
-${symbol_pound} Resource strings used by the stripes:messages tag
-stripes.messages.header=<ul class="messages">
-stripes.messages.beforeMessage=<li>
-stripes.messages.afterMessage=</li>
-stripes.messages.footer=</ul>
-
-${symbol_pound} Validation error messages produced by Stripes' built-in converter classes. These
-${symbol_pound} are default error messages and can be overridden on per-field and per-form levels.
-${symbol_pound} Using the 'invalidNumber' error for a field 'age' of a form posting to
-${symbol_pound} '/user/Profile.action', the keys looked for (in order) would be:
-${symbol_pound}      1: /user/Profile.action.age.invalidNumber
-${symbol_pound}      2: /user/Profile.action.age.errorMessage
-${symbol_pound}      3: age.errorMessage
-${symbol_pound}      4: /user/Profile.action.invalidNumber
-${symbol_pound}      5: converter.number.invalidNumber
-converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number
-converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0}
-converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date
-converter.email.invalidEmail=The value ({1}) entered is not a valid email address
-converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number
-
-${symbol_pound} Validation error messages produced by Stripes' annotation based validations. These
-${symbol_pound} are default error messages and can be overridden on per-field and per-form levels.
-${symbol_pound} Using the 'valueNotPresent' required field error for a field 'username' of a form
-${symbol_pound} posting to '/user/Register.action', the keys looked for (in order) would be:
-${symbol_pound}      1: /user/Register.action.username.valueNotPresent
-${symbol_pound}      2: /user/Register.action.username.errorMessage
-${symbol_pound}      3: username.errorMessage
-${symbol_pound}      4: /user/Register.action.valueNotPresent
-${symbol_pound}      5: validation.required.valueNotPresent
-validation.required.valueNotPresent={0} is a required field
-validation.minlength.valueTooShort={0} must be at least {2} characters long
-validation.maxlength.valueTooLong={0} must be no more than {2} characters long
-validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2}
-validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2}
-validation.mask.valueDoesNotMatch=<em>{1}</em> is not a valid {0}
-validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid
-validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100644
index e2fd1997c8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,51 +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.
-#
-
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} log4j.properties
-
-${symbol_pound} Set up a logger to the console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n
-
-${symbol_pound} Use this to only see log messages beyond a certain threshold in the console
-${symbol_pound}log4j.appender.stdout.Threshold=WARN
-
-${symbol_pound} Set up a logger to a log file
-log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n
-log4j.appender.logfile.File=${symbol_dollar}{user.home}/stripesquick.log
-log4j.appender.logfile.DatePattern='.'yyyy-MM-dd
-
-${symbol_pound} Use this to only see log messages beyond a certain threshold in the log file
-${symbol_pound}log4j.appender.logfile.Threshold=WARN
-
-${symbol_pound} Logger settings
-log4j.rootLogger=INFO, stdout, logfile
-
-${symbol_pound} Valid levels are TRACE, DEBUG, INFO, WARN, ERROR, FATAL
-${symbol_pound} Change to TRACE or DEBUG to see more log messages
-log4j.logger.net.sourceforge.stripes=WARN
-log4j.logger.org.stripesbook.quickstart=INFO
-log4j.logger.org.mortbay.log=INFO
-log4j.logger.org=WARN
-log4j.logger.com=WARN
-log4j.logger.net=WARN
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
deleted file mode 100644
index 59cdacfe23..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-#set( $symbol_pound = '#' )

-#set( $symbol_dollar = '$' )

-#set( $symbol_escape = '\' )

-<%--

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

---%>

-<%@ include file="/WEB-INF/jsp/taglibs.jsp" %>

-

-<s:layout-render name="/WEB-INF/jsp/layout.jsp" title="Welcome">

-  <s:layout-component name="body">

-    <p>sayHello returns: ${symbol_dollar}{actionBean.hello}</p>

-    <p>Congratulations, you've set up a Stripes SCA project!</p>

-  </s:layout-component>

-</s:layout-render>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
deleted file mode 100644
index 0964d2fb7b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-#set( $symbol_pound = '#' )

-#set( $symbol_dollar = '$' )

-#set( $symbol_escape = '\' )

-<%--

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

---%>

-<%@ include file="/WEB-INF/jsp/taglibs.jsp" %>

-

-<s:layout-definition>

-

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

-<html>

-  <head>

-    <title>${symbol_dollar}{title}</title>

-    <link rel="stylesheet" type="text/css" href="${symbol_dollar}{contextPath}/css/style.css">

-    <s:layout-component name="head">

-    </s:layout-component>

-  </head>

-  <body>

-    <div id="main">

-      <s:layout-component name="body">

-      </s:layout-component>

-    </div>

-  </body>

-</html>

-

-</s:layout-definition>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
deleted file mode 100644
index 6452b1bd9c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-#set( $symbol_pound = '#' )

-#set( $symbol_dollar = '$' )

-#set( $symbol_escape = '\' )

-<%--

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

---%>

-<%-- Stripes TLD --%>

-<%@ taglib prefix="s" uri="http://stripes.sourceforge.net/stripes.tld" %>

-<%@ taglib prefix="sdyn" uri="http://stripes.sourceforge.net/stripes-dynattr.tld" %>

-

-<%-- JSTL TLDs --%>

-<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"      %>

-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"       %>

-<%@ taglib prefix="fn"  uri="http://java.sun.com/jsp/jstl/functions" %>

-

-<%-- This is so that you can conveniently refer to the context path with ${symbol_dollar}{contextPath} --%>

-<c:set var="contextPath" value="${symbol_dollar}{pageContext.request.contextPath}"/>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index f98b7f2721..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/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/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           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}.sca.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d73e7311d6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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>
-
-	<listener>
-		<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-	</listener>
-
-	<filter>
-		<filter-name>StripesFilter</filter-name>
-		<filter-class>net.sourceforge.stripes.controller.StripesFilter</filter-class>
-		<init-param>
-			<param-name>ActionResolver.Packages</param-name>
-			<param-value>${package}.stripes.action</param-value>
-		</init-param>
-		<init-param>
-			<param-name>Extension.Packages</param-name>
-			<param-value>org.apache.tuscany.sca.stripes</param-value>
-		</init-param>
-	</filter>
-
-	<servlet>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<servlet-class>net.sourceforge.stripes.controller.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<filter-mapping>
-		<filter-name>StripesFilter</filter-name>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>FORWARD</dispatcher>
-	</filter-mapping>
-
-	<servlet-mapping>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<url-pattern>*.htm</url-pattern>
-	</servlet-mapping>
-
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-
-</web-app>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index a350f1e68a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-#set( $symbol_pound = '#' )

-#set( $symbol_dollar = '$' )

-#set( $symbol_escape = '\' )

-<!--

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

- -->

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

-<html>

-  <head>

-    <meta http-equiv="refresh" content="0;url=Home.htm">

-  </head>

-</html>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/META-INF/MANIFEST.MF
deleted file mode 100644
index 29e03eb396..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Name: Apache Tuscany SCA Quickstart Archetype

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

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

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

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/pom.xml
deleted file mode 100644
index ee6d7e465e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/pom.xml
+++ /dev/null
@@ -1,51 +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.1</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-quickstart</artifactId>
-    <packaging>maven-archetype</packaging>
-    <name>Create a simple Apache Tuscany SCA webapp project</name>
-    <description>Create a simple Apache Tuscany SCA webapp project</description>
-
-    <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-    <plugins>
-      <plugin>
-        <artifactId>maven-archetype-plugin</artifactId>
-        <version>2.2</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index c132fa0364..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,42 +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">
-  <requiredProperties>
-    <requiredProperty key="includeTuscanyRuntime">
-       <defaultValue>Y</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
-  <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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 7794570626..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index bfd10e8dd3..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,139 +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>
-	<name>quickstart</name>
-
-	<dependencies>
-		<!--  TUSCANY DEPENDENCIES -->
-            <dependency>
-               <groupId>org.apache.tuscany.sca</groupId>
-               <artifactId>tuscany-sca-api</artifactId>
-               <version>${tuscany.version}</version>
-               <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-               <groupId>org.apache.tuscany.sca</groupId>
-               <artifactId>tuscany-base-runtime</artifactId>
-               <version>${tuscany.version}</version>
-#if( $includeTuscanyRuntime == "Y")
-               <scope>runtime</scope>
-#else
-               <scope>provided</scope>
-#end
-            </dependency>
-
-		<!--  JUNIT DEPENDENCY FOR TESTING -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</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>${project.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>
-                        <version>${jetty.version}</version>
-			</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</tuscany.version>
-		<jetty.version>6.1.18</jetty.version>
-	</properties>
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
deleted file mode 100644
index df80303778..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
deleted file mode 100644
index 47501efb9a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 8d840b7867..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           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/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a7c7d2251e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,43 +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>
-
-#if($includeTuscanyRuntime == "Y")
-  <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>
-
-#end
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>hello.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0.1-RC1/maven/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
deleted file mode 100644
index 9729ca6823..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/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>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/LICENSE b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

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

-

-

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/NOTICE b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/NOTICE
deleted file mode 100644
index 7bd7e52af5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2013 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/README b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/README
deleted file mode 100644
index 47a7f98c57..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This module is a Maven plugin for generating diagrams for SCA composites.

-

-To configure the project add the following to the pom.xml:

-

-   <build>

-      ...

-      <plugins>

-         <plugin>

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

-            <artifactId>tuscany-diagram-plugin</artifactId>

-         </plugin>

-      ...

-      </plugins>

-   </build>

-

-

-Optional parameters are:

-  outputDirectory - The output directory for the generated diagrams, default to ${project.build.directory}/composite-diagrams

-  composites - A list of composite files

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/pom.xml
deleted file mode 100644
index 3e78928471..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/pom.xml
+++ /dev/null
@@ -1,58 +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</groupId>

-        <artifactId>tuscany-sca</artifactId>

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

-        <version>2.0.1</version>

-    </parent>

-

-    <artifactId>tuscany-diagram-plugin</artifactId>

-    <packaging>maven-plugin</packaging>

-    <name>Apache Tuscany Maven SCA Composite Diagram Plugin</name>

-    <version>2.0.1</version>

-

-    <dependencies>

-       <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-project</artifactId>

-          <version>2.1.0</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-plugin-api</artifactId>

-          <version>2.1.0</version>

-       </dependency>

-          <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-artifact</artifactId>

-          <version>2.1.0</version>

-       </dependency>

-       <dependency>

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

-          <artifactId>tuscany-composite-diagram</artifactId>

-          <version>2.0.1</version>

-       </dependency>

-

-    </dependencies>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/src/main/java/org/apache/tuscany/sca/diagram/maven/plugin/CompositeDiagramMojo.java b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/src/main/java/org/apache/tuscany/sca/diagram/maven/plugin/CompositeDiagramMojo.java
deleted file mode 100644
index 191908b575..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/src/main/java/org/apache/tuscany/sca/diagram/maven/plugin/CompositeDiagramMojo.java
+++ /dev/null
@@ -1,131 +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 org.apache.tuscany.sca.diagram.maven.plugin;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-
-/**
- * Maven Mojo to generate the diagrams for SCA composites 
- * 
- * 
- * @goal generate
- * @requiresDependencyResolution runtime
- * @phase generate-sources
- * @description 
- */
-public class CompositeDiagramMojo extends AbstractMojo {
-
-    /**
-     * @parameter expression="${composites}" 
-     */
-    private File[] composites;
-
-    /**
-     * @parameter expression="${project.basedir}/src/main/resources"
-     */
-    private File compositeDirectory;
-
-    /**
-     * @parameter expression="${project.build.directory}/composite-diagrams"
-     */
-    private File outputDirectory;
-
-    /**
-     * @parameter The base URL for the clickable blocks
-     */
-    private String baseURL;
-
-    /**
-     * @parameter
-     */
-    private boolean generateSVG = true;
-
-    /**
-     * @parameter 
-     */
-    private boolean generateJPG = false;
-
-    /**
-     * @parameter 
-     */
-    private boolean generateHTML = false;
-
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        List<File> compositeFiles = null;
-        if (composites == null || composites.length == 0) {
-            compositeFiles = listCompositeFiles();
-        } else {
-            compositeFiles = Arrays.asList(composites);
-        }
-
-        outputDirectory.mkdirs();
-        for (File f : compositeFiles) {
-            try {
-                getLog().info("Generating diagram for " + f);
-                org.apache.tuscany.sca.diagram.main.Main.generate(outputDirectory,
-                                                                  baseURL,
-                                                                  generateSVG,
-                                                                  generateHTML,
-                                                                  generateJPG,
-                                                                  f.getAbsolutePath());
-            } catch (Exception e) {
-                throw new MojoExecutionException(e.getMessage(), e);
-            }
-        }
-
-    }
-
-    private List<File> listCompositeFiles() {
-        List<File> compositeFiles = new ArrayList<File>();
-        // getLog().info(compositeDirectory.getAbsolutePath());
-        listCompositeFiles(compositeDirectory, compositeFiles);
-        return compositeFiles;
-    }
-
-    private void listCompositeFiles(File dir, List<File> files) {
-
-        if (!dir.isDirectory()) {
-            return;
-        }
-        File[] list = dir.listFiles(new FileFilter() {
-
-            @Override
-            public boolean accept(File pathname) {
-                return pathname.getName().endsWith(".composite") || pathname.isDirectory();
-            }
-        });
-
-        for (File f : list) {
-            if (f.isFile()) {
-                files.add(f);
-            } else {
-                listCompositeFiles(f, files);
-            }
-        }
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/src/main/java/org/apache/tuscany/sca/diagram/maven/plugin/NodeDiagramMojo.java b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/src/main/java/org/apache/tuscany/sca/diagram/maven/plugin/NodeDiagramMojo.java
deleted file mode 100644
index 78ae2de132..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-diagram-plugin/src/main/java/org/apache/tuscany/sca/diagram/maven/plugin/NodeDiagramMojo.java
+++ /dev/null
@@ -1,180 +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 org.apache.tuscany.sca.diagram.maven.plugin;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
-
-/**
- * Maven Mojo to generate the diagrams for Tuscany Node
- * 
- * 
- * @goal generateNodeDiagram
- * @requiresDependencyResolution runtime
- * @phase process-classes
- * @description 
- */
-public class NodeDiagramMojo extends AbstractMojo {
-
-    /**
-     * The maven project.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * @parameter expression="${project.build.directory}/composite-diagrams"
-     */
-    private File outputDirectory;
-
-    /**
-     * @parameter The node.xml
-     */
-    private File nodeConfiguration;
-
-    /**
-     * @parameter expression="${project.build.outputDirectory}"
-     */
-    private File contribution;
-
-    /**
-     * @parameter expression="${project.runtimeClasspathElements}"
-     */
-    private List<String> runtimeClasspathElements;
-
-    /**
-     * @parameter The root folder of a web application
-     */
-    private File webApplication;
-
-    /**
-     * @parameter The base URL for the clickable blocks
-     */
-    private String baseURL;
-
-    /**
-     * @parameter
-     */
-    private boolean generateSVG = true;
-
-    /**
-     * @parameter 
-     */
-    private boolean generateJPG = false;
-
-    /**
-     * @parameter 
-     */
-    private boolean generateHTML = false;
-
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        // getLog().info(String.valueOf(runtimeClasspathElements));
-        try {
-            NodeFactory factory = NodeFactory.getInstance();
-            NodeConfiguration configuration = null;
-            if (nodeConfiguration != null) {
-                getLog().info("Loading node configuration: " + nodeConfiguration);
-                configuration =
-                    factory
-                        .loadConfiguration(new FileInputStream(nodeConfiguration), nodeConfiguration.toURI().toURL());
-            } else if (contribution != null) {
-                getLog().info("Loading contribution: " + contribution);
-                configuration = factory.createNodeConfiguration().addContribution(contribution.toURI().toURL());
-            }
-
-            URL[] paths = buildClasspath();
-            ClassLoader classLoader = new URLClassLoader(paths, Thread.currentThread().getContextClassLoader());
-            outputDirectory.mkdirs();
-            String svg = org.apache.tuscany.sca.diagram.main.Main.generateDiagram(configuration, classLoader, baseURL);
-            File svgFile = new File(outputDirectory, "node.svg");
-            FileWriter fw = new FileWriter(svgFile);
-            fw.write(svg);
-            fw.close();
-        } catch (Exception e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        }
-
-    }
-
-    private URL[] buildClasspath() throws IOException {
-        List<URL> urls = new ArrayList<URL>();
-        if (webApplication != null) {
-            File root = webApplication;
-            File classes = new File(root, "WEB-INF/classes");
-            urls.add(classes.toURI().toURL());
-
-            File lib = new File(root, "WEB-INF/lib");
-            for (File jar : listJarFiles(lib)) {
-                urls.add(jar.toURI().toURL());
-            }
-        }
-        for (String path : runtimeClasspathElements) {
-            urls.add(new File(path).toURI().toURL());
-        }
-        return urls.toArray(new URL[urls.size()]);
-    }
-
-    private List<File> listJarFiles(File lib) {
-        List<File> compositeFiles = new ArrayList<File>();
-        // getLog().info(compositeDirectory.getAbsolutePath());
-        listJarFiles(lib, compositeFiles);
-        return compositeFiles;
-    }
-
-    private void listJarFiles(File dir, List<File> files) {
-
-        if (!dir.isDirectory()) {
-            return;
-        }
-        File[] list = dir.listFiles(new FileFilter() {
-
-            @Override
-            public boolean accept(File pathname) {
-                return pathname.isFile() && pathname.getName().endsWith(".jar");
-            }
-        });
-
-        for (File f : list) {
-            if (f.isFile()) {
-                files.add(f);
-            }
-            //            else {
-            //                listJarFiles(f, files);
-            //            }
-        }
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/LICENSE b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

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

-

-

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/NOTICE b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/NOTICE
deleted file mode 100644
index 7bd7e52af5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2013 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/README b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/README
deleted file mode 100644
index c9c7c0ec85..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/README
+++ /dev/null
@@ -1,21 +0,0 @@
-This module is a Maven plugin for starting a Tuscany runtime which runs the project as an SCA contribution.

-

-To configure the project add the following to the SCA contribution's pom.xml:

-

-   <build>

-      ...

-      <plugins>

-         <plugin>

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

-            <artifactId>tuscany-maven-plugin</artifactId>

-         </plugin>

-      ...

-      </plugins>

-   </build>

-

-To run the contribution in Tuscany use "mvn tuscany:run"

-

-Optional parameters are:

-  config - uri string to configure the Tuscany runtime

-  contributions - additional SCA contributions to install along with the project contribution

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/pom.xml
deleted file mode 100644
index fe7046797f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/pom.xml
+++ /dev/null
@@ -1,109 +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</groupId>

-        <artifactId>tuscany-sca</artifactId>

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

-        <version>2.0.1</version>

-    </parent>

-

-    <artifactId>tuscany-maven-plugin</artifactId>

-    <packaging>maven-plugin</packaging>

-    <name>Apache Tuscany Maven Tuscany Plugin</name>

-    <version>2.0.1</version>

-

-    <dependencies>

-       <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-project</artifactId>

-          <version>2.0.3</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-plugin-api</artifactId>

-          <version>2.0.3</version>

-       </dependency>

-          <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-artifact</artifactId>

-          <version>2.0.3</version>

-       </dependency>

-       <dependency>

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

-          <artifactId>tuscany-base-runtime</artifactId>

-          <version>2.0.1</version>

-       </dependency>

-       <dependency>

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

-          <artifactId>tuscany-domain-hazelcast</artifactId>

-          <version>2.0.1</version>

-       </dependency>

-       <dependency>

-          <groupId>jline</groupId>

-          <artifactId>jline</artifactId>

-          <version>0.9.95-huynhjl</version>

-       </dependency>

-       <dependency>

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

-          <artifactId>jetty</artifactId>

-          <version>6.1.19</version>

-          <exclusions>

-             <exclusion>

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

-	            <artifactId>servlet-api</artifactId>

-              </exclusion>

-          </exclusions>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.tomcat</groupId>

-          <artifactId>tomcat-servlet-api</artifactId>

-          <version>7.0.8</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.tomcat.embed</groupId>

-          <artifactId>tomcat-embed-core</artifactId>

-          <version>7.0.8</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.tomcat.embed</groupId>

-          <artifactId>tomcat-embed-logging-juli</artifactId>

-          <version>7.0.8</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.tomcat.embed</groupId>

-          <artifactId>tomcat-embed-jasper</artifactId>

-          <version>7.0.8</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.tomcat</groupId>

-          <artifactId>tomcat-jasper-el</artifactId>

-          <version>7.0.8</version>

-       </dependency>

-       <dependency>

-          <groupId>org.eclipse.jdt.core.compiler</groupId>

-          <artifactId>ecj</artifactId>

-          <version>3.5.1</version>

-       </dependency>

-

-    </dependencies>

-

-</project>

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
deleted file mode 100644
index 1f9a31480e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
+++ /dev/null
@@ -1,259 +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 org.apache.tuscany.maven.plugin;

-

-import java.io.File;

-import java.lang.reflect.Method;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.net.URLClassLoader;

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.servlet.ServletException;

-

-import org.apache.catalina.LifecycleException;

-import org.apache.catalina.core.AprLifecycleListener;

-import org.apache.catalina.core.StandardServer;

-import org.apache.catalina.startup.Tomcat;

-import org.apache.maven.artifact.Artifact;

-import org.apache.maven.plugin.AbstractMojo;

-import org.apache.maven.plugin.MojoExecutionException;

-import org.apache.maven.plugin.MojoFailureException;

-import org.apache.maven.project.MavenProject;

-import org.apache.tuscany.sca.shell.Shell;

-

-/**

- * Maven Mojo to run the Tuscany Shell and install the project as an SCA contribution.

- * 

- * Invoked with "mvn tuscany:run"

- * 

- * @goal run

- * @requiresDependencyResolution runtime

- * @execute phase="test-compile"

- * @description Runs Tuscany directly from a SCA conribution maven project

- */

-public class TuscanyRunMojo extends AbstractMojo {

-

-    /**

-     * The maven project.

-     *

-     * @parameter expression="${project}"

-     * @required

-     * @readonly

-     */

-    private MavenProject project;

-

-    /**

-     * The project artifactId.

-     * 

-     * @parameter expression="${project.artifactId}"

-     * @required

-     */

-    protected String artifactId;

-

-    /**

-     * The project packaging.

-     * 

-     * @parameter expression=".${project.packaging}"

-     * @required

-     */

-    protected String packaging;

-

-    /**

-     * The project build output directory

-     * 

-     * @parameter expression="${project.build.outputDirectory}"

-     * @required

-     */

-    protected File buildDirectory;

-

-    /**

-     * The project build output directory

-     * 

-     * @parameter expression="${project.build.finalName}"

-     * @required

-     */

-    protected File finalName;

-

-    /**

-     * @parameter expression="${domainURI}" default-value="uri:default"

-     */

-    private String domainURI;

-

-    /**

-     * @parameter expression="${nodeXML}"

-     */

-    private String nodeXML;

-

-    /**

-     * @parameter expression="${contributions}" 

-     */

-    private String[] contributions;

-

-    /**

-     * @parameter expression="${mainClass}"

-     */

-    private String mainClass;

-

-    /**

-     * @parameter expression="${arguments}"

-     */

-    private String[] arguments;

-

-    public void execute() throws MojoExecutionException, MojoFailureException {

-        if (mainClass != null) {

-            executeMainMethod();

-        } else if (".war".equals(packaging)) {

-            try {

-                executeTomcat();

-            } catch (Exception e) {

-                throw new MojoExecutionException("Exception running Tuscany/Tomcat", e);

-            }

-        } else {

-            executeShell();

-        }

-    }

-

-    private void executeTomcat() throws ServletException, LifecycleException, MalformedURLException {

-        getLog().info("Starting Tuscany/Tomcat...");

-        

-        Tomcat tomcat = new Tomcat();

-        tomcat.setPort(8080);

-

-        tomcat.setBaseDir("target");

-        String appBase = "../src/main/webapp";

-        tomcat.getHost().setAppBase(".");

-        String contextPath = "/" + artifactId;

-

-        StandardServer server = (StandardServer)tomcat.getServer();

-        server.setParentClassLoader(getMainClassLoader());

-        AprLifecycleListener listener = new AprLifecycleListener();

-        server.addLifecycleListener(listener);

-

-        tomcat.addWebapp(contextPath, appBase);

-        tomcat.start();

-        tomcat.getServer().await();

-    }

-

-    private void executeShell() throws MojoExecutionException {

-        getLog().info("Starting Tuscany Shell...");

-

-        if (nodeXML != null && nodeXML.length() > 0) {

-            try {

-                Shell.main(new String[]{"-nodeXML:" + nodeXML});

-            } catch (Exception e) {

-                throw new MojoExecutionException("Exception in Shell", e);

-            }

-        } else {

-            List<String> contributionList = new ArrayList<String>();

-

-            addProjectContribution(contributionList);

-

-            addAdditionalContributions(contributionList);

-

-            contributionList.add(0, "-help");

-            contributionList.add(0, domainURI);

-            

-            try {

-                Shell.main(contributionList.toArray(new String[contributionList.size()]));

-            } catch (Exception e) {

-                throw new MojoExecutionException("Exception in Shell", e);

-            }

-        }

-        

-        getLog().info("Tuscany Shell stopped.");

-    }

-

-    private void addAdditionalContributions(List<String> contributionList) throws MojoExecutionException {

-        if (contributions != null) {

-            for (String s : contributions) {

-                if (new File(s).exists()) {

-                    contributionList.add(s);

-                } else {

-                    boolean found = false;

-                    for (Object o : project.getDependencyArtifacts()) {

-                        Artifact a = (Artifact) o;

-                        if (a.getId().startsWith(s)) {

-                            try {

-                                contributionList.add(a.getFile().toURI().toURL().toString());

-                            } catch (MalformedURLException e) {

-                                throw new MojoExecutionException("", e);

-                            }

-                            found = true;

-                            break;

-                        }

-                    }

-                    if (!found) {

-                        throw new IllegalArgumentException("Contribution not found as file or dependency: " + s);

-                    }

-                }

-            }

-        }

-    }

-

-    protected void addProjectContribution(List<String> cs) throws MojoExecutionException {

-        try {

-

-            File contributionFile = new File(buildDirectory.getParent(), finalName.getName());

-            if (!contributionFile.exists()) {

-                contributionFile = new File(buildDirectory.getParent(), "classes");

-            }

-            if (!contributionFile.exists()) {

-                contributionFile = new File(buildDirectory.getParent(), finalName.getName() + packaging);

-            }

-            

-            String contribution = contributionFile.toURI().toURL().toString();

-            getLog().info("Project contribution: " + contribution);

-            cs.add(contribution);

-            

-        } catch (MalformedURLException e) {

-            throw new MojoExecutionException("", e);

-        }

-    }

-

-    public void executeMainMethod() throws MojoExecutionException, MojoFailureException {

-        getLog().info("Invoking " + mainClass + " class main method...");

-        

-        if (arguments == null) {

-            arguments = new String[0];

-        }

-

-        try {

-            Method main = getMainClassLoader().loadClass(mainClass).getMethod("main", new Class[] {String[].class});

-            main.invoke(main, new Object[] {arguments});

-        } catch (NoSuchMethodException e) {

-            throw new MojoExecutionException("The specified mainClass doesn't contain a main method with appropriate signature", e);

-        } catch (Exception e) {

-            throw new MojoExecutionException("exception invoking main method", e);

-        }

-    }

-

-    private ClassLoader getMainClassLoader() throws MalformedURLException {

-        ClassLoader parent = Thread.currentThread().getContextClassLoader();

-        List<URL> classPathEntries = new ArrayList<URL>();

-        classPathEntries.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL());

-        for (Object o : project.getRuntimeArtifacts()) {

-            Artifact a = (Artifact) o;

-            classPathEntries.add( a.getFile().toURI().toURL() );

-        }

-        return new URLClassLoader((URL[])classPathEntries.toArray(new URL[]{}), parent );

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
deleted file mode 100644
index 6d7c4f656a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
+++ /dev/null
@@ -1,76 +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 org.apache.tuscany.maven.plugin;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.StringTokenizer;

-

-import org.apache.maven.plugin.AbstractMojo;

-import org.apache.maven.plugin.MojoExecutionException;

-import org.apache.maven.plugin.MojoFailureException;

-import org.apache.tuscany.sca.shell.Shell;

-

-/**

- * Maven Mojo to run the Tuscany Shell

- * 

- * Invoked with mvn org.apache.tuscany.maven.plugin:maven-tuscany-plugins:shell [-DdomainURI=uri:myDomain] [-Dcontributions=path\to\scacontribution,...]

- * 

- * @goal shell

- * @requiresProject false

- * @requiresDependencyResolution runtime

- */

-public class TuscanyShellMojo extends AbstractMojo {

-

-    /**

-     * @parameter expression="${domainURI}" default-value="uri:default"

-     */

-    private String domainURI;

-    

-    /**

-     * @parameter expression="${contributions}" 

-     */

-    private String contributions;

-

-    public void execute() throws MojoExecutionException, MojoFailureException {

-        getLog().info("Starting Tuscany Shell...");

-        

-        String[] args;

-        if (contributions != null) {

-            List<String> cs = new ArrayList<String>();

-            StringTokenizer st = new StringTokenizer(contributions, ",");

-            while (st.hasMoreTokens()) {

-                cs.add(st.nextToken());

-            }

-            cs.add(0, "-help");

-            cs.add(0, domainURI);

-            args = cs.toArray(new String[cs.size()]);

-        } else {

-            args = new String[]{domainURI};

-        }

-

-        try {

-            Shell.main(args);

-        } catch (Exception e) {

-            throw new MojoExecutionException("Exception in Shell", e);

-        }

-

-        getLog().info("Tuscany Shell stopped.");

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java
deleted file mode 100644
index 49857a8eb6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java
+++ /dev/null
@@ -1,194 +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 org.apache.tuscany.maven.plugin;

-

-import java.io.File;

-import java.net.MalformedURLException;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.apache.maven.artifact.Artifact;

-import org.apache.maven.plugin.AbstractMojo;

-import org.apache.maven.plugin.MojoExecutionException;

-import org.apache.maven.plugin.MojoFailureException;

-import org.apache.maven.project.MavenProject;

-import org.apache.tuscany.sca.Node;

-import org.apache.tuscany.sca.TuscanyRuntime;

-

-/**

- * Maven Mojo to start a Tuscany runtime and install the project as an SCA

- * contribution. Invoked with "mvn tuscany:start" usually from configuration in

- * a module pom.xml

- * 

- * @goal start

- * @requiresDependencyResolution runtime

- * @execute phase="test-compile"

- * @description Start a Tuscany directly and run composites from a SCA

- *              conribution maven project

- */

-public class TuscanyStartMojo extends AbstractMojo {

-

-    public static Map<String, TuscanyRuntime> runtimes = new HashMap<String, TuscanyRuntime>();

-

-    /**

-     * The maven project.

-     * 

-     * @parameter expression="${project}"

-     * @required

-     * @readonly

-     */

-    private MavenProject project;

-

-    /**

-     * The project artifactId.

-     * 

-     * @parameter expression="${project.artifactId}"

-     * @required

-     */

-    protected String artifactId;

-

-    /**

-     * The project packaging.

-     * 

-     * @parameter expression=".${project.packaging}"

-     * @required

-     */

-    protected String packaging;

-

-    /**

-     * The project build output directory

-     * 

-     * @parameter expression="${project.build.outputDirectory}"

-     * @required

-     */

-    protected File buildDirectory;

-

-    /**

-     * The project build output directory

-     * 

-     * @parameter expression="${project.build.finalName}"

-     * @required

-     */

-    protected File finalName;

-

-    /**

-     * @parameter expression="${id}" default-value="defaultId"

-     */

-    private String id;

-

-    /**

-     * @parameter expression="${domainURI}" default-value="uri:default"

-     */

-    private String domainURI;

-

-    /**

-     * @parameter expression="${nodeConfig}"

-     */

-    private String nodeConfig;

-

-    /**

-     * @parameter expression="${contributions}"

-     */

-    private String[] contributions;

-

-    public void execute() throws MojoExecutionException, MojoFailureException {

-        getLog().info("Starting Tuscany Runtime...");

-        

-        TuscanyRuntime runtime = TuscanyRuntime.newInstance();

-        runtimes.put(id, runtime);

-

-        if (nodeConfig != null && nodeConfig.length() > 0) {

-            try {

-                runtime.createNodeFromXML(nodeConfig);

-            } catch (Exception e) {

-                throw new MojoExecutionException("Exception creating node", e);

-            }

-        } else {

-            List<String> contributionList = new ArrayList<String>();

-

-            addProjectContribution(contributionList);

-

-            addAdditionalContributions(contributionList);

-            

-            Node node = runtime.createNode(domainURI);

-            for (String c : contributionList) {

-                String curi;

-                try {

-                    curi = node.installContribution(null, c, null, null);

-                } catch (Exception e) {

-                    throw new MojoExecutionException("Exception installing contribution", e);

-                }

-                try {

-                    node.startDeployables(curi);

-                } catch (Exception e) {

-                    throw new MojoExecutionException("Exception starting deployables for contribution " + curi, e);

-                }

-            }

-        }

-    }

-

-    private void addAdditionalContributions(List<String> contributionList) throws MojoExecutionException {

-        if (contributions != null) {

-            for (String s : contributions) {

-                if (new File(s).exists()) {

-                    contributionList.add(s);

-                } else {

-                    boolean found = false;

-                    for (Object o : project.getDependencyArtifacts()) {

-                        Artifact a = (Artifact)o;

-                        if (a.getId().startsWith(s)) {

-                            try {

-                                contributionList.add(a.getFile().toURI().toURL().toString());

-                            } catch (MalformedURLException e) {

-                                throw new MojoExecutionException("", e);

-                            }

-                            found = true;

-                            break;

-                        }

-                    }

-                    if (!found) {

-                        throw new IllegalArgumentException("Contribution not found as file or dependency: " + s);

-                    }

-                }

-            }

-        }

-    }

-

-    protected void addProjectContribution(List<String> cs) throws MojoExecutionException {

-        try {

-

-            File contributionFile = new File(buildDirectory.getParent(), finalName.getName());

-            if (!contributionFile.exists()) {

-                contributionFile = new File(buildDirectory.getParent(), "classes");

-            }

-            if (!contributionFile.exists()) {

-                contributionFile = new File(buildDirectory.getParent(), finalName.getName() + packaging);

-            }

-

-            String contribution = contributionFile.toURI().toURL().toString();

-            getLog().info("Project contribution: " + contribution);

-            cs.add(contribution);

-

-        } catch (MalformedURLException e) {

-            throw new MojoExecutionException("", e);

-        }

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java b/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java
deleted file mode 100644
index 02f464619d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java
+++ /dev/null
@@ -1,59 +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 org.apache.tuscany.maven.plugin;

-

-import org.apache.maven.plugin.AbstractMojo;

-import org.apache.maven.plugin.MojoExecutionException;

-import org.apache.maven.plugin.MojoFailureException;

-import org.apache.tuscany.sca.TuscanyRuntime;

-

-/**

- * Maven Mojo to stop a Tuscany runtime that was started with the start mojo.

- * 

- * @goal stop

- * @execute phase="test-compile"

- * @description Stop a Tuscany runtime that was started with the start mojo

- */

-public class TuscanyStopMojo extends AbstractMojo {

-

-    /**

-     * @parameter expression="${id}" default-value="defaultId"

-     */

-    private String id;

-

-    public void execute() throws MojoExecutionException, MojoFailureException {

-        if (id.length() < 1) {

-            // if id is set to "" then stop all runtimes

-            for (String id : TuscanyStartMojo.runtimes.keySet()) {

-                TuscanyRuntime runtime = TuscanyStartMojo.runtimes.get(id);

-                runtime.stop();

-                getLog().info("stopped Tuscany runtime " + id);

-            }

-            TuscanyStartMojo.runtimes.clear();

-        } else {

-            TuscanyRuntime runtime = TuscanyStartMojo.runtimes.remove(id);

-            if (runtime == null) {

-                getLog().info("No started runtime found for ID " + id);

-            } else {

-                runtime.stop();

-                getLog().info("stopped Tuscany runtime " + id);

-            }

-        }

-    }

-}