Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

14 files changed, 0 insertions, 633 deletions

diff --git a/branches/sca-java-1.5/samples/implementation-notification/README b/branches/sca-java-1.5/samples/implementation-notification/README
deleted file mode 100644
index 7adfa4e5dc..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Notification Implementation Sample

-===============================

-

-This sample illustrates the use of <implementation.notification/>

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows, use following command:

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-notification.jar notification.TrafficAdvisoryClient

-

-on *nix, use following command:

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-implementation-notification.jar notification.TrafficAdvisoryClient

-

-OR you can also use Maven to test:

-

-mvn test

-

-Sample Overview

----------------

-

-This sample consists of a single composite that contains a notification component,

-a producer component and two consumer components. Take a look at the composite file 

-or the .svg file which shows the composite file in pictorial form. The notification

-component has an <implementation.notification/> that refers to the component type

-that defines the TrafficAdvisory java interface. This interface indicates the

-makeup of the messages being sent and received and is also implemented by the

-consumer components.

-

-Sample directory structure:

-

-implementation-notification/

-  src/

-    main/

-      java/

-        notification/

-          TestCaseProducer.java                    - interface for the producer component

-          TrafficAdvisory.java                     - interface for the notification and consumer components

-          TrafficAdvisoryConsumer.java             - implementation for the consumer components

-          TrafficAdvisoryProducer.java             - implementation for the producer component

-    test/

-      java/

-        notification/

-          TrafficAdvisoryTestCase.java             - JUnit test case

-      resources/

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer,

-                                                     notification component, and consumers

-  pom.xml                                          - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd implementation-notification

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Consumer [Consumer1] received report: Nothing to report today

-     [java] Consumer [Consumer2] received report: Nothing to report today

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd implementation-notification

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running notification.TrafficAdvisoryTestCase

-Consumer [Consumer1] received report: Nothing to report today

-Consumer [Consumer2] received report: Nothing to report today

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.742 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

diff --git a/branches/sca-java-1.5/samples/implementation-notification/build.xml b/branches/sca-java-1.5/samples/implementation-notification/build.xml
deleted file mode 100644
index 110c7b84c1..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="implementation-notification" default="compile">

-    <property name="test.class" value="notification.TrafficAdvisoryClient" />

-	<property name="test.jar"   value="sample-implementation-notification.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png b/branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png
deleted file mode 100644
index 0b7ee34bf7..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png
+++ /dev/null
diff --git a/branches/sca-java-1.5/samples/implementation-notification/pom.xml b/branches/sca-java-1.5/samples/implementation-notification/pom.xml
deleted file mode 100644
index 1f7a15d412..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/pom.xml
+++ /dev/null
@@ -1,76 +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>1.5-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-implementation-notification</artifactId>
-    <name>Apache Tuscany SCA Sample Notification Implementation</name>
-    <version>1.5-SNAPSHOT</version>
-    <description>A sample illustrating use of implementation.notification</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <!-- if this is not in, BuilderRegistryImpl throws NPE (line 96) -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- end -->
-		        
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-	<finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <defaultGoal>install</defaultGoal>
-    </build>
-</project>
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
deleted file mode 100644
index bf8c72e0ce..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +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 notification;

-

-public interface TestCaseProducer {

-

-    public void produceTrafficNotification(String report);

-}

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
deleted file mode 100644
index 7bbfda2122..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ /dev/null
@@ -1,24 +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 notification;

-

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
deleted file mode 100644
index da32bab58d..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
+++ /dev/null
@@ -1,45 +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 notification;

-

-import notification.TestCaseProducer;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class TrafficAdvisoryClient {

-    

-    public static void main(String[] args) throws Exception {

-        try {

-            SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-            TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-

-            testCaseProducer.produceTrafficNotification("Nothing to report today");

-

-            domain.close();

-        } catch(Throwable e) {

-            e.printStackTrace();

-            if (e instanceof Exception) {

-                throw (Exception)e;

-            }

-            else {

-                throw new Exception(e);

-            }

-        }

-    }

-}

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 2aaae596be..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,39 +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 notification;

-

-import org.osoa.sca.annotations.Property;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

-

-/**

- * @version $Rev$ $Date$

- */

-@Service(TrafficAdvisory.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryConsumer implements TrafficAdvisory {

-    

-    @Property

-    protected String name;

-

-    public void trafficNotification(String report) {

-        

-        System.out.println("Consumer [" + name + "] received report: " + report);

-    }

-}

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
deleted file mode 100644
index a0bb02e846..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.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 notification;

-

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

-

-@Service(TestCaseProducer.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryProducer implements TestCaseProducer {

-    

-    @Reference

-    protected TrafficAdvisory destination;

-

-    public void produceTrafficNotification(String report) {

-        

-        destination.trafficNotification(report);

-    }

-}

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.    

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </reference>

-</componentType>

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

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

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="TrafficAdvisoryNotificationLocalComposite">

-

-    <component name="TrafficAdvisoryProducer">

-        <implementation.java class="notification.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer2">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer2</property>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
deleted file mode 100644
index 719141c94b..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,60 +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 notification;

-

-import junit.framework.TestCase;

-

-import notification.TestCaseProducer;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class TrafficAdvisoryTestCase extends TestCase {

-    

-    private SCADomain domain;

-    private TestCaseProducer testCaseProducer;

-    

-    public void testTrafficAdvisoryNotification() throws Exception {

-        try {

-            testCaseProducer.produceTrafficNotification("Nothing to report today");

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        try {

-            domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-            testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-        } catch(Throwable e) {

-            e.printStackTrace();

-            if (e instanceof Exception) {

-                throw (Exception)e;

-            }

-            else {

-                throw new Exception(e);

-            }

-        }

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-}

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.    

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </reference>

-</componentType>

diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

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

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="TrafficAdvisoryNotificationLocalComposite">

-

-    <component name="TrafficAdvisoryProducer">

-        <implementation.java class="notification.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer2">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer2</property>

-    </component>

-

-</composite>