1859 files changed, 0 insertions, 110905 deletions

diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/pom.xml b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/pom.xml
deleted file mode 100644
index 6efa14c812..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/pom.xml
+++ /dev/null
@@ -1,210 +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>itest-bpel</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel-helloworld-reference</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Reference BPEL iTest</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-			<version>1.1</version>
-			<type>zip</type>
-		</dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.0</version>
-		</dependency>	
-		        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                <!--  http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>			
-			<!-- 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-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</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1-incubating</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sca</groupId>
-				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
-								</wsdlFile>
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			-->
-		</plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
deleted file mode 100644
index 532b84bd22..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ /dev/null
@@ -1,31 +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 greetings;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface GreetingsService {
-
-    public String getGreetings(String name);
-}
-
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
deleted file mode 100644
index 86d7f245e8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ /dev/null
@@ -1,33 +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 greetings;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(GreetingsService.class)
-public class GreetingsServiceImpl implements GreetingsService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
deleted file mode 100644
index 8dea2715bf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.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 greetings;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the Greetings service
- * 
- * @version $Rev$ $Date$
- */
-public class GreetingsTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    GreetingsService greetingsService = null;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("greetings/greetings.composite");
-        greetingsService = scaDomain.getService(GreetingsService.class, "GreetingsServiceComponent");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testInvoke() {
-        String response = greetingsService.getGreetings("Luciano");
-        assertEquals("Hello Luciano", response);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 672dbdc0b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String hello(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index d7ebd5cbb8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import greetings.GreetingsService;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceImpl implements HelloWorldService {
-   
-    protected GreetingsService greetingsService;
-
-    public GreetingsService getGreetingsService() {
-        System.out.println("Got Injected greetingsService");
-        return greetingsService;
-    }
-
-    @Reference
-    public void setGreetingsService(GreetingsService greetingsService) {
-        System.out.println("Injected greetingsService");
-        this.greetingsService = greetingsService;
-    }
-    
-    public String hello(String name) {
-        System.out.println("Calling greeting services getGreetings");
-        return greetingsService.getGreetings(name);
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index bdfedee2f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,55 +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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL Helloworld Service
- * 
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase extends TestCase {
-    private SCADomain scaDomain;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testServiceInvocation() {
-        HelloWorldService bpelService = scaDomain.getService(HelloWorldService.class, "HelloWorldService");
-        String response = bpelService.hello("Luciano");
-        assertEquals("Hello Luciano", response);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
deleted file mode 100644
index dfec43e8e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://greetings"
-	xmlns:hw="http://greetings"
-    name="greetings">
-
-    <component name="GreetingsServiceComponent">
-        <implementation.java class="greetings.GreetingsServiceImpl" />
-	    <service name="GreetingsService">
-	    	<interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" />
-	    </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
deleted file mode 100644
index e768707ccd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ /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.    
--->
-<wsdl:definitions name="greetings"
-    targetNamespace="http://greetings" 
-    xmlns:tns="http://greetings" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://greetings" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="Greetings">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="GreetingsSoapBinding" type="tns:Greetings">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="GreetingsService">
-        <wsdl:port name="GreetingsSoapPort" binding="tns:GreetingsSoapBinding">
-            <wsdlsoap:address location="http://localhost:8085/GreetingsServiceComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="GreetingsPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:Greetings"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 25d676bcfc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
+++ /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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:greetings="http://greetings"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloWorld"/>
-		</provide>
-		<invoke partnerLink="greetingsPartnerLink">
-			<service name="tus:greetingsPartnerLink" port="Greetings"/>
-		</invoke>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 5ec2cc9f2e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ /dev/null
@@ -1,84 +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://helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:helloworld="http://helloworld"

-    xmlns:greetings="http://greetings"
-    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://helloworld"/>
-

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

-     namespace="http://greetings"/>

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

-      <partnerLink name="greetingsPartnerLink" partnerLinkType="greetings:GreetingsPartnerLinkType" partnerRole="Provider" initializePartnerRole="yes" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="helloworld:HelloMessage"/>

-     <variable name="helloResponse" messageType="helloworld:HelloMessage"/>

-     <variable name="greetingsRequest" messageType="greetings:getGreetingsRequest"/>

-     <variable name="greetingsResponse" messageType="greetings:getGreetingsResponse"/>

-   </variables>
-
-   <sequence>
-       <receive
-          name="start"

-          createInstance="yes"
-          operation="hello"

-          variable="helloMessage"

-          partnerLink="helloPartnerLink"
-          portType="helloworld:HelloWorld" />
-

-       <assign name="assignToGreetingsRequest">

-          <copy>

-              <from>$helloMessage.TestPart</from>

-              <to>$greetingsRequest.parameters</to>

-          </copy>

-       </assign>

-
-      <invoke name="invokeGreetings"

-              operation="getGreetings"

-              inputVariable="greetingsRequest"

-              outputVariable="greetingsResponse"

-              partnerLink="greetingsPartnerLink"

-              portType="greetings:Greetings" />

-

-       <assign name="assignToHelloResponse">

-          <copy>

-              <from>$greetingsResponse.parameters/greetings:getGreetingsReturn</from>

-              <to>$helloResponse.TestPart</to>

-          </copy>

-       </assign>

-

-       <reply name="end"  

-              operation="hello"
-              partnerLink="helloPartnerLink"
-              portType="helloworld:HelloWorld" 
-              variable="helloResponse"/>
-   </sequence>
-</process>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 13d12e32a0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
+++ /dev/null
@@ -1,36 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-  </service>
-
-  
-  <reference name="greetingsPartnerLink">
-        <interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" />
-  </reference>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index 504e2ccc5d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://helloworld"
-    name="helloworld">
-    
-    <component name="HelloWorldService">
-    	<implementation.bpel process="hns:HelloWorld"/>
-    	<reference name="greetingsPartnerLink" target="GreetingsServiceComponent"/>
-    </component>
-    
-    <component name="GreetingsServiceComponent">
-        <implementation.java class="greetings.GreetingsServiceImpl" />
-	    <service name="GreetingsService">
-	    	<interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" />
-	    </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 0f51b96b27..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/helloworld/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 name="helloworld"
-    targetNamespace="http://helloworld"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://helloworld"
-    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://helloworld" 
-           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="HelloWorld">
-        <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:HelloWorld">
-        <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="HelloWorldService">
-		<wsdl:port name="HelloSoapPort" 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:HelloWorld"/>
-       <plnk:role name="you" portType="tns:HelloWorld"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
deleted file mode 100644
index 4e13380e0b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=OFF, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=OFF
-log4j.category.org.hibernate.type=OFF
-log4j.category.org.objectweb=OFF
-log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/pom.xml
deleted file mode 100644
index df92d378a9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/pom.xml
+++ /dev/null
@@ -1,176 +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>itest-bpel</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel-helloworld-ws</artifactId>
-    <name>Apache Tuscany SCA HelloWorld BPEL iTest</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.1</version>
-		</dependency>	
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-				        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                                <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-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</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1-incubating</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sca</groupId>
-				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
-								</wsdlFile>
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index ffdbc50a22..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.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 helloworld;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HelloWorld {
-    private HelloPortType helloService;
-    
-    public HelloWorld() {
-        super();
-    }
-    
-    @Reference
-    public void setHelloService(HelloPortType helloService){
-        this.helloService = helloService;
-    }
-    
-    public String hello(String hello) throws java.rmi.RemoteException {
-        System.out.println(">>> Invoking helloService.hello with : " + hello);
-        return this.helloService.hello(hello);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 6971151a77..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,64 +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 helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL Helloworld Service
- * 
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testPing() throws IOException {
-        new Socket("127.0.0.1", 8085);
-    }
-    
-    public void testServiceInvocation() throws Exception {
-        HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldServiceComponent");
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
+++ /dev/null
@@ -1,31 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/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="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    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="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="helloMessage" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="helloMessage" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="helloMessage"/>
-   </sequence>
-</process>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index f864f45613..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="helloworld">
-    
-    <component name="BPELHelloWorldServiceComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-        <service name="helloPartnerLink">
-        	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-        	<binding.ws uri="http://localhost:8085/HelloPartnerLink" wsdlElement="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.service(HelloService)"/>
-        </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 610bda3cc4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/helloworld/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 name="helloworld"
-    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/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
deleted file mode 100644
index 37f66e4189..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG

-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n

diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/pom.xml b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/pom.xml
deleted file mode 100644
index e0c5ff7f90..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/pom.xml
+++ /dev/null
@@ -1,162 +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>itest-bpel</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel-helloworld</artifactId>
-    <name>Apache Tuscany SCA HelloWorld BPEL iTest</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.1</version>
-		</dependency>	
-		        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                                <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-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</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1-incubating</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sca</groupId>
-				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
-								</wsdlFile>
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index ffdbc50a22..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.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 helloworld;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HelloWorld {
-    private HelloPortType helloService;
-    
-    public HelloWorld() {
-        super();
-    }
-    
-    @Reference
-    public void setHelloService(HelloPortType helloService){
-        this.helloService = helloService;
-    }
-    
-    public String hello(String hello) throws java.rmi.RemoteException {
-        System.out.println(">>> Invoking helloService.hello with : " + hello);
-        return this.helloService.hello(hello);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 76fcd35c2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,63 +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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL Helloworld Service
- * 
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testServiceInvocation() throws Exception {
-        HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldService");
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);
-    }
-    
-    public void testReferenceInvocation() throws Exception {
-        HelloWorld bpelService = scaDomain.getService(HelloWorld.class, "BPELHelloWorld");
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);        
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
+++ /dev/null
@@ -1,31 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/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="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    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="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="helloMessage" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="helloMessage" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="helloMessage"/>
-   </sequence>
-</process>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index f6b12fb14b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="helloworld">
-    
-    <component name="BPELHelloWorld">
-        <implementation.java class="helloworld.HelloWorld"/>
-        <reference name="helloService" target="BPELHelloWorldService">
-            <!--  Workaround for databinding issue -->
-        	<!--  interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" / -->
-        </reference>
-    </component>
-    
-    <component name="BPELHelloWorldService">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 610bda3cc4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/helloworld/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 name="helloworld"
-    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/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/log4j.properties b/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/log4j.properties
deleted file mode 100644
index 37f66e4189..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG

-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n

diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/pom.xml b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/pom.xml
deleted file mode 100644
index 501f0b248d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/pom.xml
+++ /dev/null
@@ -1,195 +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>itest-bpel</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-bpel-ping-pong</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Reference BPEL iTest</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency> 

-        

-        <dependency>

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

-            <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-sdo-impl</artifactId>

-            <version>1.1-incubating</version>

-        </dependency>

-

-		<dependency>

-		    <groupId>xerces</groupId>

-		    <artifactId>xercesImpl</artifactId>

-		    <version>2.8.0</version>

-		</dependency>	

-		        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

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

-		<plugins>

-			<plugin>

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

-				<artifactId>maven-surefire-plugin</artifactId>

-                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->

-                <version>2.3.1</version>

-				<configuration>

-					<useFile>false</useFile>

-					<trimStackTrace>false</trimStackTrace>

-					<useSystemClassLoader>true</useSystemClassLoader>

-				</configuration>

-			</plugin>

-			<plugin>

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

-				<artifactId>maven-dependency-plugin</artifactId>

-				<executions>

-					<execution>

-						<id>unpack</id>

-						<phase>test-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</version>

-									<type>zip</type>

-									<overWrite>true</overWrite>

-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>

-								</artifactItem>

-							</artifactItems>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-			<plugin>

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

-				<artifactId>tuscany-sdo-plugin</artifactId>

-				<version>1.1-incubating</version>

-				<executions>

-					<execution>

-						<id>generate-bpel-ping</id>

-						<phase>generate-sources</phase>

-						<configuration>

-							<schemaFile>${basedir}/src/test/resources/ping/ping.wsdl</schemaFile>

-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>

-							<prefix>Ping</prefix>

-							<noNotification>true</noNotification>

-							<noContainer>true</noContainer>

-							<noUnsettable>true</noUnsettable>

-						</configuration>

-						<goals>

-							<goal>generate</goal>

-						</goals>

-					</execution>

-

-					<execution>

-						<id>generate-bpel-pong</id>

-						<phase>generate-sources</phase>

-						<configuration>

-							<schemaFile>${basedir}/src/test/resources/pong/pong.wsdl</schemaFile>

-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>

-							<prefix>Pong</prefix>

-							<noNotification>true</noNotification>

-							<noContainer>true</noContainer>

-							<noUnsettable>true</noUnsettable>

-						</configuration>

-						<goals>

-							<goal>generate</goal>

-						</goals>

-					</execution>

-

-				</executions>

-			</plugin>

-			<plugin>

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

-				<artifactId>tuscany-maven-wsdl2java</artifactId>

-				<version>1.3</version>

-				<executions>

-					<execution>

-						<configuration>

-							<wsdlFiles>

-								<wsdlFile>

-									<fileName>${basedir}/src/test/resources/ping/ping.wsdl</fileName>

-								</wsdlFile>

-								<wsdlFile>

-									<fileName>${basedir}/src/test/resources/pong/pong.wsdl</fileName>

-								</wsdlFile>

-							</wsdlFiles>

-						</configuration>

-						<goals>

-							<goal>generate</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
deleted file mode 100644
index 1ab2ba3d5d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.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 org.apache.tuscany.sca.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPingPongTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PingPortType bpelPing = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("ping-pong/ping-pong.composite");
-        //bpelPing = scaDomain.getService(PingPortType.class, "BPELPingPong-PingComponent/PingService");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        //scaDomain.close();
-    }
-
-    public void testPing() {
-        //String response = bpelPing.Ping("Ping");
-        //System.out.println("response:" + response);
-        //assertNotNull(response);
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
deleted file mode 100644
index 34f82318a3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
+++ /dev/null
@@ -1,63 +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.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPingTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PingPortType bpelService = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("ping/ping.composite");
-        //bpelService = scaDomain.getService(PingPortType.class, "BPELPingComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        //scaDomain.close();
-    }
-
-    public void testInvoke() {
-        /*
-        String response = bpelService.Ping("Ping");
-        System.out.println("response:" + response);
-        assertNotNull(response);
-        */
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
deleted file mode 100644
index 313bd66850..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
+++ /dev/null
@@ -1,62 +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.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.pong.PongPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPongTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PongPortType bpelService = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("pong/pong.composite");
-        bpelService = scaDomain.getService(PongPortType.class, "BPELPongComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testInvoke() {
-        String response = bpelService.Pong("Pong");
-        System.out.println("response:" + response);
-        assertNotNull(response);
-        
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/log4j.properties b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/log4j.properties
deleted file mode 100644
index 01bf8d8bf5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/log4j.properties
+++ /dev/null
@@ -1,33 +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 root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF

-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n

diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
deleted file mode 100644
index e4cbdfe89c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
+++ /dev/null
@@ -1,36 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="PingService">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)" />
-  </service>
-
-  <service name="PongService">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-
-  <reference name="Pong">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </reference>
-</componentType>  
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
deleted file mode 100644
index a0eb4d0b5b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
+++ /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.    
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-    xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-    name="ping">
-    
-    <component name="BPELPingPong-PingComponent">
-        <implementation.bpel process="ping:Ping"/>
-        <reference name="Pong" target="BPELPingPong-PongComponent/PongService"/>
-    </component>
-    
-    <component name="BPELPingPong-PongComponent">
-        <implementation.bpel process="pong:Pong"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/deploy.xml b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/deploy.xml
deleted file mode 100644
index 613ed9c491..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/deploy.xml
+++ /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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:process="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl">
-
-	<process name="process:Ping">
-		<active>true</active>
-		<provide partnerLink="PingPartnerLink">
-			<service name="ping:PingService" port="PingPort"/>
-		</provide>
-		<invoke partnerLink="PongPartnerLink">
-			<service name="pong:PongService" port="PongPort"/>
-		</invoke>
-	</process>
-    
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.bpel b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.bpel
deleted file mode 100644
index abda9e58d2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.bpel
+++ /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.
-  -->
-<process
-        name="Ping"
-        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-    <import location="ping.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-    <import location="pong.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-    <partnerLinks>
-        <partnerLink name="PingPartnerLink"
-                partnerLinkType="ping:PingPartnerLinkType"
-                myRole="Provider" />
-        <partnerLink name="PongPartnerLink"
-                partnerLinkType="pong:PongPartnerLinkType"
-                partnerRole="Provider"
-                initializePartnerRole="yes" />
-    </partnerLinks>
-
-    <variables>
-        <variable messageType="ping:PingRequest" name="pingRequest"/>
-        <variable messageType="ping:PingResponse" name="pingResponse"/>
-        <variable messageType="pong:PongRequest" name="pongRequest"/>
-        <variable messageType="pong:PongResponse" name="pongResponse"/>
-        <variable type="xsd:string" name="text" />
-    </variables>
-
-    <sequence name="Main">
-        <receive name="pingReceive"
-                createInstance="yes"
-                operation="Ping"
-                partnerLink="PingPartnerLink"
-                portType="ping:PingPortType"
-                variable="pingRequest"/>
-
-        <assign name="assignPongRequest">
-            <!-- add "ping" text to the input text -->
-            <copy>
-                <from>concat($pingRequest.body/ping:text, ' ping')</from>
-                <to variable="text"/>
-            </copy>
-            <!-- initialize pongRequest -->
-            <copy>
-                <from>
-                    <literal>
-                        <pong:PongRequest>
-                            <pong:text/>
-                        </pong:PongRequest>
-                    </literal>
-                </from>
-                <to>$pongRequest.body</to>
-            </copy>
-            <!-- copy new text into pongRequest -->
-            <copy>
-                <from>$text</from>
-                <to>$pongRequest.body/pong:text</to>
-            </copy>
-        </assign>
-        
-        <invoke name="invokePong"
-                operation="Pong"
-                inputVariable="pongRequest"
-                outputVariable="pongResponse"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"/>
-        
-        <assign name="assignPingResponse">
-            <copy>
-                <from>$pongResponse.body/pong:text</from>
-                <to>$text</to>
-            </copy>
-            <!-- initialize pingResponse -->
-            <copy>
-                <from>
-                    <literal>
-                        <ping:PingResponse>
-                            <ping:text/>
-                        </ping:PingResponse>
-                    </literal>
-                </from>
-                <to>$pingResponse.body</to>
-            </copy>
-            <!-- copy new text into pingResponse -->
-            <copy>
-                <from>$text</from>
-                <to>$pingResponse.body/ping:text</to>
-            </copy>
-        </assign>
-
-        <reply name="pingReply"
-                partnerLink="PingPartnerLink"
-                portType="ping:PingPortType"
-                operation="Ping"
-                variable="pingResponse"/>
-    </sequence>
-</process>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.componentType b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.componentType
deleted file mode 100644
index 7598a99d16..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.componentType
+++ /dev/null
@@ -1,36 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <reference name="Pong">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </reference>
-
-  <service name="PingService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)" />
-  </service>
-
-  <service name="PongService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-</componentType>  
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.composite b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.composite
deleted file mode 100644
index 75eed03022..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-    name="ping">
-    
-    <component name="BPELPingComponent">
-        <implementation.bpel process="ping:Ping"/>
-    </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
deleted file mode 100644
index 03e54c4de8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.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.
-  -->
-<definitions name="Ping"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PingRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PingResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PingRequest">
-        <part name="body" element="tns:PingRequest"/>
-    </message>
-
-    <message name="PingResponse">
-        <part name="body" element="tns:PingResponse"/>
-    </message>
-
-    <portType name="PingPortType">
-        <operation name="Ping">
-            <input message="tns:PingRequest"/>
-            <output message="tns:PingResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PingSoapBinding" type="tns:PingPortType">
-    	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    	<operation name="Ping">
-    		<soap:operation soapAction="" />
-    		<input name="PingRequest">
-    			<soap:body use="literal" />
-    		</input>
-    		<output name="PingResponse">
-    			<soap:body use="literal" />
-    		</output>
-    	</operation>
-    </binding>
-
-    <service name="PingService">
-    	<port name="PingPort" binding="tns:PingSoapBinding">
-    		<soap:address location="http://localhost:8085/ode/processes/ping" />
-    	</port>
-    </service>
-
-    <plnk:partnerLinkType name="PingPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PingPortType"/>
-    </plnk:partnerLinkType>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/pong.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
deleted file mode 100644
index 1f4c4a9aaa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.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.
-  -->
-<definitions name="Pong"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PongRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PongResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PongRequest">
-        <part name="body" element="tns:PongRequest"/>
-    </message>
-
-    <message name="PongResponse">
-        <part name="body" element="tns:PongResponse"/>
-    </message>
-
-    <portType name="PongPortType">
-        <operation name="Pong">
-            <input message="tns:PongRequest"/>
-            <output message="tns:PongResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PongSoapBinding" type="tns:PongPortType">
-	    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Pong">
-            <soap:operation soapAction=""/>
-            <input name="PongRequest">
-                <soap:body use="literal"/>
-            </input>
-            <output name="PongResponse">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-	</binding>
-    
-    <service name="PongService">
-		<port name="PongPort" binding="tns:PongSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/pong"/>
-		</port>
-    </service>    
-    
-    <plnk:partnerLinkType name="PongPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PongPortType"/>
-    </plnk:partnerLinkType>
-</definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/deploy.xml b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/deploy.xml
deleted file mode 100644
index 1315ef47f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/deploy.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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:process="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl">
-
-	<process name="process:Pong">
-		<active>true</active>
-		<provide partnerLink="PongPartnerLink">
-			<service name="pong:PongService" port="PongPort"/>
-		</provide>
-	</process>
-    
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.bpel b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.bpel
deleted file mode 100644
index b5d84898c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.bpel
+++ /dev/null
@@ -1,84 +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.
-  -->
-<process
-        name="Pong"
-        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
-
-    <import location="pong.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-
-    <partnerLinks>
-        <partnerLink name="PongPartnerLink"
-                partnerLinkType="pong:PongPartnerLinkType"
-                myRole="Provider" />
-    </partnerLinks>
-
-    <variables>
-        <variable messageType="pong:PongRequest" name="pongRequest"/>
-        <variable messageType="pong:PongResponse" name="pongResponse"/>
-        <variable type="xsd:string" name="text" />
-    </variables>
-
-    <sequence name="Main">
-        <receive name="pongReceive"
-                createInstance="yes"
-                operation="Pong"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"
-                variable="pongRequest"/>
-
-        <assign name="assignPongRequest">
-            <!-- add "ping" text to the input text -->
-            <copy>
-                <from>concat($pongRequest.body/pong:text, ' pong')</from>
-                <to>$text</to>
-            </copy>
-            <!-- initialize pongResponse -->
-            <copy>
-                <from>
-                    <literal>
-                        <pong:PongRequest>
-                            <pong:text/>
-                        </pong:PongRequest>
-                    </literal>
-                </from>
-                <to>$pongResponse.body</to>
-            </copy>
-            <!-- copy new text into pongResponse -->
-            <copy>
-                <from>$text</from>
-                <to>$pongResponse.body/pong:text</to>
-            </copy>
-        </assign>
-        
-        <reply name="pongReply"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"
-                operation="Pong"
-                variable="pongResponse"/>
-    </sequence>
-</process>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.componentType b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.componentType
deleted file mode 100644
index 2f8fd5d3de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.componentType
+++ /dev/null
@@ -1,29 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="PongService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-
-</componentType>  
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.composite b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.composite
deleted file mode 100644
index e40ce7ee45..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.composite
+++ /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.    
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-    name="pong">
-    
-    <component name="BPELPongComponent">
-        <implementation.bpel process="pong:Pong"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.wsdl b/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
deleted file mode 100644
index 21ee8b82f6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.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.
-  -->
-<definitions name="Pong"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PongRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PongResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PongRequest">
-        <part name="body" element="tns:PongRequest"/>
-    </message>
-
-    <message name="PongResponse">
-        <part name="body" element="tns:PongResponse"/>
-    </message>
-
-    <portType name="PongPortType">
-        <operation name="Pong">
-            <input message="tns:PongRequest"/>
-            <output message="tns:PongResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PongSoapBinding" type="tns:PongPortType">
-	    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Pong">
-            <soap:operation soapAction=""/>
-            <input name="PongRequest">
-                <soap:body use="literal"/>
-            </input>
-            <output name="PongResponse">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-	</binding>
-    
-    <service name="PongService">
-		<port name="PongPort" binding="tns:PongSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/pong"/>
-		</port>
-    </service>    
-    
-    <plnk:partnerLinkType name="PongPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PongPortType"/>
-    </plnk:partnerLinkType>
-    
-    <!--
-    
-    This is an abstract interface/portType definition.  Note the lack of 
-    binding and service.  Since Pong is only exposed on the JBI bus, the
-    JBI endpoint is defined in Pong.dd.
-
-    -->
-
-</definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/bpel/pom.xml b/tags/java/sca/1.3-RC1a/itest/bpel/pom.xml
deleted file mode 100644
index ae0e2a5a4b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/bpel/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA BPEL Integration Tests</name>
-
-    <modules>
-       <module>helloworld</module>
-       <module>helloworld-ws</module>
-       <module>helloworld-reference</module>
-    </modules>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/build-was-integration.xml b/tags/java/sca/1.3-RC1a/itest/build-was-integration.xml
deleted file mode 100644
index 03de4c050f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/build-was-integration.xml
+++ /dev/null
@@ -1,68 +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="was-integration" default="main" basedir="."> 
-
-  <property environment="env"/>
-
-  <target name="startServer">
-    <exec dir="." executable="${env.WAS_HOME}/bin/startServer.sh">
-      <arg value="server1" />
-      <!--
-      <arg value="-username" />
-      <arg value="${sWasUser}" />
-      <arg value="-password" />
-      <arg value="${sWasPassword}" />
-      -->
-    </exec>
-  </target>
-
-  <target name="stopServer">
-    <exec dir="." executable="${env.WAS_HOME}/bin/stopServer.sh">
-      <arg value="server1" />
-      <!--
-      <arg value="-username" />
-      <arg value="${sWasUser}" />
-      <arg value="-password" />
-      <arg value="${sWasPassword}" />
-      -->
-    </exec>
-  </target>
-
-  <target name="installApplication">
-    <echo>Installing war ${application.war} on ${application.server} using name ${application.name} and context root ${application.contextRoot} </echo>
-    <exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
-       <arg line="-conntype SOAP -lang jython -f ${was.python.script} installApplicationOnServer ${application.war} ${application.name} ${application.contextRoot} ${application.server}" />
-    </exec>
-
-    <echo>Starting application ${application.name} on ${application.server}</echo>
-    <exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
-       <arg line="-conntype SOAP -lang jython -f ${was.python.script} startApplicationOnServer ${application.name} ${application.server}" />
-    </exec>
-   </target>
-
-  <target name="uninstallApplication">
-    <echo>Uninstalling ${application.name} </echo>
-    <exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
-       <arg line="-conntype SOAP -lang jython -f ${was.python.script} uninstallApplicationOnServer ${application.name}" />
-    </exec>
-   </target>
-
- 
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/pom.xml
deleted file mode 100644
index 06da2fb960..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-callablereferences-ws</artifactId>

-    <name>Apache Tuscany Test for Callable References over Web Services</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index ecf1ac27e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ /dev/null
@@ -1,26 +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 com.example;

-

-public interface ExampleClient {

-

-    void runTest();

-

-    void sayHello(String name);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index c46087d865..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.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 com.example;

-

-import org.osoa.sca.CallableReference;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

-

-@Service(ExampleClient.class)

-@Scope("COMPOSITE")

-public class ExampleClientImpl implements ExampleClient {

-

-    private ExampleService myService;

-

-    @Context

-    protected ComponentContext context;

-

-    @Reference

-    public void setMyService(ExampleService myService) {

-        this.myService = myService;

-    }

-

-    public void runTest() {

-        ServiceReference<ExampleClient> ref = context.createSelfReference(ExampleClient.class);

-        ref.getService().sayHello("Jack");

-        CallableReference result = myService.hello("Jill", ref);

-        if (result != null) {

-            ((CallableReference<ExampleClient>)result).getService().sayHello("John");

-        }

-        result = myService.hello("Jane", null);

-        if (result != null) {

-            ((CallableReference<ExampleClient>)result).getService().sayHello("Jim");

-        }

-    }

-

-    public void sayHello(String name) {

-        System.out.println("Hello, client " + name + "!");

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 670c145cc3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ /dev/null
@@ -1,30 +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 com.example;

-

-import org.osoa.sca.CallableReference;

-import org.osoa.sca.ServiceReference;

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

-

-@Remotable

-public interface ExampleService {

-

-	CallableReference hello(String name, ServiceReference ref);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index eb4d647a22..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ /dev/null
@@ -1,33 +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 com.example;

-

-import org.osoa.sca.CallableReference;

-import org.osoa.sca.ServiceReference;

-

-public class ExampleServiceImpl implements ExampleService {

-

-    public CallableReference hello(String name, ServiceReference ref) {

-        if (ref != null) {

-            ((ServiceReference<ExampleClient>)ref).getService().sayHello(name);

-        }

-        return (CallableReference)ref;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
deleted file mode 100644
index bb5e57397d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ /dev/null
@@ -1,26 +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.itest.callablerefwsreturn;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Alpha {
-    boolean run();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
deleted file mode 100644
index 6e5f1cedf9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ /dev/null
@@ -1,96 +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.itest.callablerefwsreturn;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(Alpha.class)
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
-    @Reference
-    public Beta beta;
-
-    @Context
-    protected ComponentContext componentContext;
-    
-    Object conversationId0 = null;
-
-    public boolean run() {
-        CallableReference<Gamma> gammaRef = null;
-        try {
-            Object conversationId1 = null;
-            Object conversationId2 = null;
-            
-            // it is expected that this call returns a reference to Gamma that
-            // reuses the established Conversation
-            gammaRef = beta.getRef();
-
-            // no Conversation exists
-            Conversation con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha1: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha1: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId1 = con.getConversationID();                
-            }
-
-            // this call should reuse a Conversation, but as none exists it
-            // creates a new conversation
-            gammaRef.getService().doSomething();
-            gammaRef.getService().doSomething();
-            gammaRef.getService().doSomething();
-            
-            con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha2: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha2: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId2 = con.getConversationID();                
-            }
-            
-            boolean testPassed = conversationId1.equals(conversationId2);
-            
-            if (conversationId0 == null){
-                conversationId0 = conversationId1;
-                return testPassed;
-            } else {
-                return testPassed && (!conversationId0.equals(conversationId1));
-            }
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (gammaRef != null) {
-                gammaRef.getService().stop();
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
deleted file mode 100644
index 995e4fcf39..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.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 org.apache.tuscany.sca.itest.callablerefwsreturn;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Beta {
-    CallableReference<Gamma> getRef();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
deleted file mode 100644
index be72fd779e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ /dev/null
@@ -1,46 +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.itest.callablerefwsreturn;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(Beta.class)
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta {
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    public Gamma gamma;
-
-    public CallableReference<Gamma> getRef() {
-        ServiceReference<Gamma> gammaRef = componentContext
-                .getServiceReference(Gamma.class, "gamma");
-        Gamma g = gammaRef.getService();
-        g.start();
-        return gammaRef;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
deleted file mode 100644
index b73f26b573..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ /dev/null
@@ -1,34 +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.itest.callablerefwsreturn;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma {
-    int start();
-
-    void doSomething();
-
-    @EndsConversation
-    void stop();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
deleted file mode 100644
index c3abc4c65d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
+++ /dev/null
@@ -1,49 +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.itest.callablerefwsreturn;
-
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(Gamma.class)
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma {
-    @ConversationID
-    protected String conversationId;
-
-    public GammaImpl() {
-        System.out.println("GammaImpl:GammaImpl(), conversationId="
-                + conversationId);
-    }
-
-    public int start() {
-        System.out.println("Gamma:start(), conversationId=" + conversationId);
-        return 1;
-    }
-
-    public void doSomething() {
-        System.out.println("Gamma:doSomething(), conversationId="
-                + conversationId);
-    }
-
-    public void stop() {
-        System.out.println("Gamma:stop(), conversationId=" + conversationId);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
deleted file mode 100644
index 3d782a0b84..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ /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
-    * 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:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:s="http://test"
-	name="test">
-
-	<component name="Alpha">
-		<implementation.java
-			class="org.apache.tuscany.sca.itest.callablerefwsreturn.AlphaImpl" />
-		<service name="Alpha">
-			<binding.sca />
-		</service>
-		<reference name="beta">
-			<binding.ws uri="http://localhost:8085/Beta" />
-		</reference>
-	</component>
-
-	<component name="Beta">
-		<implementation.java
-			class="org.apache.tuscany.sca.itest.callablerefwsreturn.BetaImpl" />
-		<service name="Beta">
-			<binding.ws uri="http://localhost:8085/Beta" />
-		</service>
-		<reference name="gamma">
-			<binding.ws uri="http://localhost:8085/Gamma" />
-		</reference>
-	</component>
-
-	<component name="Gamma">
-		<implementation.java
-			class="org.apache.tuscany.sca.itest.callablerefwsreturn.GammaImpl" />
-		<service name="Gamma">
-			<binding.ws uri="http://localhost:8085/Gamma" />
-		</service>
-	</component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/resources/example.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/resources/example.composite
deleted file mode 100644
index ea0819a32e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/main/resources/example.composite
+++ /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.    

--->

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

-           targetNamespace="http://www.example.com"

-           xmlns:hw="http://www.example.com"

-           name="example">

-

-    <component name="ExampleClientComponent">

-        <implementation.java class="com.example.ExampleClientImpl" />

-        <reference name="myService">

-            <interface.java interface="com.example.ExampleService" />

-            <binding.ws uri="http://localhost:8085/axis2/services/ExampleService" />

-        </reference>

-    </component>

-

-    <component name="ExampleComponent">

-        <implementation.java class="com.example.ExampleServiceImpl"/>

-        <service name="ExampleService">

-            <interface.java interface="com.example.ExampleService" />

-            <binding.ws uri="http://localhost:8085/axis2/services/ExampleService" />

-        </service>  

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 310e31fb02..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
+++ /dev/null
@@ -1,44 +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 com.example;

-

-import junit.framework.TestCase;

-

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

-

-public class ExampleTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private ExampleClient client;

-

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("example.composite");

-        client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    public void test() throws Exception {

-        client.runTest();

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
deleted file mode 100644
index 66fb2ef96c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
+++ /dev/null
@@ -1,49 +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.itest.callablerefws;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefwsreturn.Alpha;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceReturnTestCase {
-    private static SCADomain domain;
-    private static Alpha alpha;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceWsReturnTest.composite");
-        alpha = domain.getService(Alpha.class, "Alpha");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testCallableReferenceReturn() {
-        Assert.assertTrue(alpha.run());
-        Assert.assertTrue(alpha.run());
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/pom.xml b/tags/java/sca/1.3-RC1a/itest/callablereferences/pom.xml
deleted file mode 100644
index 55864fe6e7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/pom.xml
+++ /dev/null
@@ -1,74 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callablereferences</artifactId>
-    <name>Apache Tuscany SCA Callable References Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>  
-        
-                      
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
deleted file mode 100644
index d6b3807d31..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.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 org.apache.tuscany.sca.itest.callableref;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AComponent {
-    String foo();
-    
-    String fooB();
-    String fooB1();
-
-    String fooC();
-    String fooC1();
-    
-    String fooStringD();
-    String fooD();
-
-    String fooBC();
-
-    DComponent getDReference();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
deleted file mode 100644
index 09a0ceb629..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ /dev/null
@@ -1,114 +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.itest.callableref;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(AComponent.class)
-public class AComponentImpl implements AComponent {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference(name = "bReference")
-    protected BComponent b;
-
-    @Reference
-    protected CComponent cReference;
-    
-    @Reference
-    protected ServiceReference<CComponent> cServiceReference;
-
-    @Reference(required=false)
-    protected DComponent dReference;
-    
-    protected DComponent dReference1;
-
-    @Reference(name = "dReference1")
-    public void setDReference(DComponent dReference) {
-        this.dReference1 = dReference;
-    }
-
-    public String foo() {
-        return "AComponent";
-    }
-
-    public String fooB() {
-        return b.foo();
-    }
-
-    public String fooB1() {
-        CallableReference<BComponent> bRef = componentContext.cast(b);
-        return bRef.getService().foo();
-    }
-    
-    public String fooC() {
-        return cReference.foo();
-    }
-
-    public String fooC1() {
-        return cServiceReference.getService().foo();
-    }
-    
-    public String fooBC() {
-        CallableReference<CComponent> cReference = componentContext.getServiceReference(CComponent.class, "cReference");
-        return b.fooC(cReference);
-    }
-
-    public String fooD() {
-        CallableReference<AComponent> aReference = componentContext.createSelfReference(AComponent.class);
-        return dReference1.foo(aReference);
-    }
-    
-    /**
-     * A test case to work out what needs to be done in a transformer to get the 
-     * CallableReference across the wire. Left here for interest in case anyone 
-     * is looking for how to get at the innards of CallableReferences
-     */
-    public String fooStringD() {
-        CallableReference<AComponent> aReference = componentContext.createSelfReference(AComponent.class);
-        ByteArrayOutputStream bos = null;
-        
-        try {
-            bos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(bos);
-            oos.writeObject(aReference);
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            return null;
-        }
-        
-        String aReferenceString = Base64Binary.encode(bos.toByteArray());
-        return dReference1.fooString(aReferenceString);
-    }    
-
-    public DComponent getDReference() {
-        return dReference;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
deleted file mode 100644
index ade672b0ab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ /dev/null
@@ -1,30 +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.itest.callableref;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface BComponent {
-
-    String foo();
-
-    String fooC(CallableReference<CComponent> cComponent);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
deleted file mode 100644
index 518e77d3a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.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 org.apache.tuscany.sca.itest.callableref;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
-    public BComponentImpl() {
-    }
-
-    public String foo() {
-        return "BComponent";
-    }
-
-    public String fooC(CallableReference<CComponent> cReference) {
-        return "B" + cReference.getService().foo();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
deleted file mode 100644
index fdf80cc1c8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.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 org.apache.tuscany.sca.itest.callableref;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CComponent {
-
-    String foo();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
deleted file mode 100644
index cc8ec8f000..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ /dev/null
@@ -1,30 +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.itest.callableref;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(CComponent.class)
-public class CComponentImpl implements CComponent {
-
-    public String foo() {
-        return "CComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
deleted file mode 100644
index 48b697df31..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ /dev/null
@@ -1,30 +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.itest.callableref;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface DComponent {
-
-    String foo(CallableReference<AComponent> aReference); 
-    
-    String fooString(String aReferenceString);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
deleted file mode 100644
index 27ad48b9fe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ /dev/null
@@ -1,65 +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.itest.callableref;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(DComponent.class)
-public class DComponentImpl implements DComponent {
-
-    @Context
-    protected RequestContext requestContext;
-
-    public String foo(CallableReference<AComponent> aReference) {
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(bos);
-            oos.writeObject(aReference);
-            ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
-            Object obj = ois.readObject();
-            aReference = (CallableReference<AComponent>) obj;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("Invoking service: " + requestContext.getServiceName());
-        return "D" + aReference.getService().foo();
-    }
-    
-    public String fooString(String aReferenceString) {
-        CallableReference<AComponent> aReference = null;
-        try {
-            ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64Binary.decode(aReferenceString)));
-            Object obj = ois.readObject();
-            aReference = (CallableReference<AComponent>) obj;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("Invoking service: " + requestContext.getServiceName());
-        return "D" + aReference.getService().foo();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
deleted file mode 100644
index abcedfa6e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
+++ /dev/null
@@ -1,68 +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.itest.callablerefconversational;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple conversational Service that is used to testing the method
- * ComponentContext.createSelfReference()
- * 
- * @version $Date$ $Revision$
- */
-@Conversational
-public interface ConversationalService {
-    /**
-     * Default value for the user data
-     */
-    String DEFAULT_USER_DATA = "NOT SET";
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    Object getConversationID();
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    ServiceReference<ConversationalService> createSelfRef();
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    void setUserData(String a_Data);
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    String getUserData();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
deleted file mode 100644
index f2e0ce7582..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
+++ /dev/null
@@ -1,111 +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.itest.callablerefconversational;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service that is used to testing the method
- * ComponentContext.createSelfReference()
- * 
- * @version $Date$ $Revision$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-public class ConversationalServiceImpl implements ConversationalService {
-
-    /**
-     * The Conversation ID
-     */
-    private Object m_ConversationID;
-
-    /**
-     * Reference to the ComponentContext.
-     */
-    @Context
-    protected ComponentContext m_Ctx;
-
-    /**
-     * Some user data
-     */
-    private String m_UserData = DEFAULT_USER_DATA;
-
-    /**
-     * Constructor
-     */
-    public ConversationalServiceImpl() {
-        System.out.println("New instance of " + this + " created");
-    }
-
-    /**
-     * Used to inject the Conversation ID
-     * 
-     * @param a_ConversationID the Conversation ID
-     */
-    @ConversationID
-    public void setConversationID(Object a_ConversationID) {
-        m_ConversationID = a_ConversationID;
-        System.out.println("Converstation ID set on " + this + " to " + a_ConversationID);
-    }
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    public Object getConversationID() {
-        return m_ConversationID;
-    }
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    public ServiceReference<ConversationalService> createSelfRef() {
-        return m_Ctx.createSelfReference(ConversationalService.class);
-    }
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    public void setUserData(String a_Data) {
-        m_UserData = a_Data;
-    }
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    public String getUserData() {
-        return m_UserData;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
deleted file mode 100644
index ab21421c4d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.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 org.apache.tuscany.sca.itest.callablerefreturn;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Alpha
-{	
-	boolean run();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
deleted file mode 100644
index 5b5984b164..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ /dev/null
@@ -1,86 +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.itest.callablerefreturn;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
-    @Reference
-    public Beta beta;
-
-    @Context
-    protected ComponentContext componentContext;
-
-    public boolean run() {
-        CallableReference<Gamma> gammaRef = null;
-        try {
-            Object conversationId1 = null;
-            Object conversationId2 = null;
-
-            // it is expected that this call returns a reference to Gamma that
-            // reuses the established Conversation
-            gammaRef = beta.getRef();
-
-            // no Conversation exists
-            Conversation con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId1 = con.getConversationID();
-            }
-
-            // this call should reuse a Conversation, but as none exists it
-            // creates a new conversation
-            gammaRef.getService().doSomething();
-            con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId2 = con.getConversationID();
-            }
-
-            if ((conversationId1 == null) || (conversationId2 == null)) {
-                return false;
-            }
-
-            boolean testPassed = conversationId1.equals(conversationId2);
-            return testPassed;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (gammaRef != null) {
-                gammaRef.getService().stop();
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
deleted file mode 100644
index 223c467f47..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.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 org.apache.tuscany.sca.itest.callablerefreturn;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Beta
-{	
-	CallableReference<Gamma> getRef();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
deleted file mode 100644
index ed4e66bec3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
+++ /dev/null
@@ -1,44 +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.itest.callablerefreturn;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta
-{
-    @Context
-    protected ComponentContext componentContext;
-    
-    @Reference
-    public Gamma gamma;
-	        
-	public CallableReference<Gamma> getRef()
-	{
-		ServiceReference<Gamma> gammaRef = componentContext.getServiceReference(Gamma.class, "gamma");		
-		gammaRef.getService().start();		
-		return gammaRef;
-	}
-	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
deleted file mode 100644
index e32051373f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.callablerefreturn;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma
-{	
-	void start();
-			
-	void doSomething();
-	
-	@EndsConversation
-	void stop();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
deleted file mode 100644
index adf5a1c1ce..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ /dev/null
@@ -1,47 +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.itest.callablerefreturn;
-
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma
-{    	
-    @ConversationID
-    protected String conversationId;
-       
-
-	public void start()
-	{	
-		System.out.println("Gamma:start(), conversationId=" + conversationId);
-	}
-	
-
-	public void doSomething()	
-	{
-		System.out.println("Gamma:doSomething(), conversationId=" + conversationId);
-	}
-
-	
-	public void stop()
-	{
-		System.out.println("Gamma:stop(), conversationId=" + conversationId);
-	}
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
deleted file mode 100644
index 0bf8f7ef1e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.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
-    * 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:foo="http://foo" targetNamespace="http://foo"
-    name="CallableReferenceConversation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <service name="ConversationalService" promote="ConversationalComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService" />
-    </service>
-
-    <component name="ConversationalComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.callablerefconversational.ConversationalServiceImpl" />
-    </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
deleted file mode 100644
index 5b3add1e61..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.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
-    * 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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://test"			
-		name="test">
-
-	<component name="Alpha">
-		<implementation.java class="org.apache.tuscany.sca.itest.callablerefreturn.AlphaImpl"/>
-		<reference name="beta" target="Beta"/>		
-	</component>
-    
-	<component name="Beta">
-		<implementation.java class="org.apache.tuscany.sca.itest.callablerefreturn.BetaImpl"/>
-		<reference name="gamma" target="Gamma"/>
-	</component>     
-
-	<component name="Gamma">
-		<implementation.java class="org.apache.tuscany.sca.itest.callablerefreturn.GammaImpl"/>
-	</component>     
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
deleted file mode 100644
index 49b75f56e4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ /dev/null
@@ -1,45 +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

-    * 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:foo="http://foo" targetNamespace="http://foo"

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

-

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.callableref.AComponent" />

-    </service>

-

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.AComponentImpl" />

-        <reference name="bReference" target="BComponent" />

-        <reference name="cReference" target="CComponent" />

-        <reference name="cServiceReference" target="CComponent" />

-        <reference name="dReference1" target="DComponent" />

-    </component>

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.BComponentImpl" />

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.CComponentImpl" />

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.DComponentImpl" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
deleted file mode 100644
index 9216f44191..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ /dev/null
@@ -1,46 +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

-    * 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:foo="http://foo" targetNamespace="http://foo"

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

-

-    <!--service name="AComponentService" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.callableref.AComponent" />

-        <binding.sca uri="http://localhost:8084/AComponentService"/>

-    </service-->

-

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.AComponentImpl" />

-        <service name="AComponent">

-            <binding.sca uri="http://localhost:8084/AComponent"/>

-        </service>

-        <reference name="bReference">

-            <binding.sca uri="http://localhost:8085/BComponent" />

-        </reference>

-        <reference name="cReference">

-            <binding.sca uri="http://localhost:8085/CComponent" />

-        </reference>        

-        <reference name="cServiceReference">

-            <binding.sca uri="http://localhost:8085/CComponent" />

-        </reference>        

-        <reference name="dReference1">

-            <binding.sca uri="http://localhost:8085/DComponent" />

-        </reference>

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 95021f72a4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo">
-    <deployable composite="foo:CompositeA" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
deleted file mode 100644
index 42d739564c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ /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

-    * 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:foo="http://foo" targetNamespace="http://foo"

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

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.BComponentImpl" />

-        <service name="BComponent">

-             <binding.sca uri="http://localhost:8085/BComponent"/>

-        </service>

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.CComponentImpl" />

-        <service name="CComponent">

-             <binding.sca uri="http://localhost:8085/CComponent"/>

-        </service>        

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.DComponentImpl" />

-        <service name="DComponent">

-             <binding.sca uri="http://localhost:8085/DComponent"/>

-        </service>        

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 2edda61601..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo">
-    <deployable composite="foo:CompositeB" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
deleted file mode 100644
index a9cbb5d0a1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ /dev/null
@@ -1,109 +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.itest.callableref;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osoa.sca.ServiceReference;
-
-/**
- * Simple test case that creates a ServiceReference to a Conversational Component
- * using ComponentContext.createSelfReference()
- * <p>
- * This test case is for TUSCANY-2208
- * 
- * @version $Date$ $Revision$
- */
-public class CallableReferenceConversationalTestCase {
-    private static SCADomain domain;
-    private static ConversationalService acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceConversationalTest.composite");
-        Assert.assertNotNull(domain);
-        acomponent = domain.getService(ConversationalService.class, "ConversationalComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * This is a dummy test so that this Unit Test has a test so it will build.
-     * Once TUSCANY-2208 is fixed, this dummy test method can be removed 
-     */
-    @Test
-    public void dummyTestRemoveWhenTuscany2208IsFixed() {
-    }
-
-    /**
-     * Tests creating Self References and validate them with Conversation IDs
-     */
-    // Disabled until TUSCANY-2208 is fixed
-    // @Test
-    public void testCreateSelfRefUsingConvID() {
-        Assert.assertNotNull(acomponent);
-
-        final Object origConvID = acomponent.getConversationID();
-        Assert.assertNotNull(origConvID);
-        final ServiceReference<ConversationalService> ref = acomponent.createSelfRef();
-        Assert.assertNotNull(ref);
-
-        final ConversationalService resolvedRef = ref.getService();
-        Assert.assertNotNull(resolvedRef);
-        final Object newConvID = resolvedRef.getConversationID();
-        Assert.assertNotNull(newConvID);
-
-        Assert.assertEquals(origConvID, newConvID);
-    }
-
-    /**
-     * Tests creating Self References and validate them with user specified data 
-     */
-    // Disabled until TUSCANY-2208 is fixed
-    // @Test
-    public void testCreateSelfRefUsingUserData() {
-        Assert.assertNotNull(acomponent);
-
-        final String origUserData = acomponent.getUserData();
-        Assert.assertEquals(ConversationalService.DEFAULT_USER_DATA, origUserData);
-
-        final String userData = "Some new user data set at " + System.currentTimeMillis();
-        acomponent.setUserData(userData);
-
-        final ServiceReference<ConversationalService> ref = acomponent.createSelfRef();
-        Assert.assertNotNull(ref);
-
-        final ConversationalService resolvedRef = ref.getService();
-        Assert.assertNotNull(resolvedRef);
-        final String newUserData = resolvedRef.getUserData();
-        Assert.assertNotNull(newUserData);
-
-        Assert.assertEquals(userData, newUserData);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
deleted file mode 100644
index a52f4de71b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ /dev/null
@@ -1,145 +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.itest.callableref;

-

-

-import static junit.framework.Assert.assertEquals;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-

-/**

- * Runs a distributed domain in a single VM by using and in memory 

- * implementation of the distributed domain

- */

-public class CallableReferenceRemoteTestCase {

-    

-    private static SCANode2 nodeA;

-    private static SCANode2 nodeB;

-   

-    private static AComponent acomponent;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        

-        try {

-            

-            System.out.println("Setting up nodes");

-                  

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/nodeA").toURL().toString()));

-            

-     

-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/nodeB").toURL().toString()));

-            

-            

-            nodeA.start();

-            nodeB.start();

-            

-            acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent");

-               

-        } catch (Throwable ex) {

-            System.out.println(ex.toString());

-            // Print detailed cause information.

-            ex.printStackTrace();

-            StringBuffer sb = new StringBuffer();

-            Throwable cause = ex.getCause();

-            while ( cause != null ) {

-                sb.append( "   " );

-                System.out.println( sb.toString() + "Cause: " + cause );

-                if (cause instanceof java.lang.reflect.InvocationTargetException)

-                    System.out.println( sb.toString() + "Target Exception: " + ((java.lang.reflect.InvocationTargetException)cause).getTargetException() );

-                cause = cause.getCause();                

-            }

-        }

-   }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        // stop the nodes and hence the domains they contain        

-        nodeA.stop();

-        nodeB.stop();

-    }

-

-    //@Test

-    public void testKeepServerRunning1() throws Exception {

-        System.out.println("press enter to continue");

-        System.in.read();

-    } 

-    

-    @Test

-    public void testBReference() {

-        assertEquals("BComponent", acomponent.fooB());

-    }

-

-    @Test

-    public void testBCast() {

-        assertEquals("BComponent", acomponent.fooB1());

-    }

-    

-    @Test

-    public void testCReference() {

-        assertEquals("CComponent", acomponent.fooC());

-    }

-    

-    @Test

-    public void testCServiceReference() {

-        assertEquals("CComponent", acomponent.fooC1());

-    }    

-

-    @Test

-    public void testDReferenceString() {

-        assertEquals("DAComponent", acomponent.fooStringD());

-    }

-  

-    @Test

-    public void testDReference() {

-        assertEquals("DAComponent", acomponent.fooD());

-    }    

-

-    

-    @Test

-    public void testBCReference() {

-        assertEquals("BCComponent", acomponent.fooBC());

-    }

-

-    @Test

-    public void testRequiredFalseReference() {

-        try {

-            acomponent.getDReference().foo(null);

-        } catch (Exception e) {

-            Assert.assertTrue(true);

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
deleted file mode 100644
index f2d8fe5d64..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.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 org.apache.tuscany.sca.itest.callableref;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefreturn.Alpha;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceReturnTestCase {
-    private static SCADomain domain;
-    private static Alpha alpha;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceReturnTest.composite");
-        alpha = domain.getService(Alpha.class, "Alpha");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testCallableReferenceReturn() {
-        Assert.assertTrue(alpha.run());
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
deleted file mode 100644
index 2b7750b443..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ /dev/null
@@ -1,83 +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.itest.callableref;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceTest.composite");
-        acomponent = domain.getService(AComponent.class, "AComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testBReference() {
-        assertEquals("BComponent", acomponent.fooB());
-    }
-
-    @Test
-    public void testBCast() {
-        assertEquals("BComponent", acomponent.fooB1());
-    }
-    
-    @Test
-    public void testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-    
-    @Test
-    public void testCServiceReference() {
-        assertEquals("CComponent", acomponent.fooC1());
-    }    
-
-    @Test
-    public void testDReference() {
-        assertEquals("DAComponent", acomponent.fooD());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test
-    public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().foo(null);
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-api/pom.xml
deleted file mode 100644
index e6fcddb911..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-api</artifactId>
-    <name>Apache Tuscany SCA Callback API Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
-    </properties>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
deleted file mode 100644
index de17ba2f0d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackApiCallBack {
-    /**
-     * This function is defined in CallBackApiClientImpl
-     */
-    public void callBackMessage(String aString);
-
-    /**
-     * This function is defined in CallBackApiClientImpl
-     */
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
deleted file mode 100644
index 5fd4a71466..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ /dev/null
@@ -1,30 +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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackApiClient {
-    /**
-     * This function is defined in CallBackApiClientImpl
-     */
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
deleted file mode 100644
index 274984abb3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ /dev/null
@@ -1,206 +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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiClient.class)
-public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack {
-
-    @Reference
-    protected CallBackApiService aCallBackService;
-
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-    private static Object monitor = new Object();
-
-    /**
-     * This test calls function test 3a,3a1,3b,3c
-     */
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        // Test3a is the basic callback where the target calls back prior to
-        // returning to the client.
-        test3a();
-
-        test3a1();
-
-        // Test3b is where the target does not call back to the client.
-        test3b();
-
-        // Test3c is where the target calls back multiple times to the client.
-        test3c();
-
-        return;
-    }
-
-    /**
-     * This test is the basic callback where the target calls back prior to returning to the client.
-     */
-
-    private void test3a() {
-        aCallBackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
-    }
-
-    /**
-     * This test is the basic callback where the target calls back prior to returning to the client.
-     */
-    private void test3a1() {
-        aCallBackService.knockKnockByRef("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
-    }
-
-    /**
-     * This test is the basic callback where the target does not call back to the client
-     */
-    private void test3b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackApiITest - test3b", 1, 1);
-        return;
-    }
-
-    /**
-     * This test is the basic callback where the target calls back multiple times to the client
-     */
-
-    private void test3c() {
-        aCallBackService.multiCallBack("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallBackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackApiITest - test3c", 3, this.getCallBackCount());
-        return;
-    }
-
-    /**
-     * This function returns a string
-     * 
-     * @param void
-     * @return String result string
-     */
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    /**
-     * This function set the returnMessage string
-     * 
-     * @param String
-     */
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    /**
-     * This function returns the callBackCount variable
-     * 
-     * @return Integer callBackCount variable
-     */
-    public int getCallBackCount() {
-        return callBackCount;
-    }
-
-    /**
-     * This function increments callBackCount variable by 1
-     */
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    /**
-     * This function prints a message synched with setReturnMessage function
-     * 
-     * @param String
-     */
-    public void callBackMessage(String aString) {
-        System.out.println("Entering callback callBackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    /**
-     * This function prints a message synched with incrementCallBackCount function
-     * 
-     * @param String
-     */
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallBackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
deleted file mode 100644
index 33de1e7739..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ /dev/null
@@ -1,50 +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.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackApiCallBack.class)
-/**
- * 
- */
-public interface CallBackApiService {
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void knockKnock(String aString);
-
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void knockKnockByRef(String aString);
-
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void noCallBack(String aString);
-
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
deleted file mode 100644
index 61e2c7ee8f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ /dev/null
@@ -1,123 +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.test;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiService.class)
-public class CallBackApiServiceImpl implements CallBackApiService {
-
-    @Context
-    protected ComponentContext componentContext;
-    /**
-     * Object of CallBackApiCallBack class
-     */
-    private CallBackApiCallBack callback;
-
-    @Callback
-    protected CallableReference<CallBackApiCallBack> callbackRef;
-
-    /**
-     * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function and calls the
-     * callBackMessage function.
-     * 
-     * @param aString String passed by a function call
-     */
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-        callback = this.getCallBackInterface();
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
-    }
-
-    /**
-     * This function calls the callBackMessage function. <br>
-     * The reference to this function is received from Call back reference to the class CallBackApiService.
-     * 
-     * @param aString String passed by a function call
-     */
-    public void knockKnockByRef(String aString) {
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-        callbackRef.getService().callBackMessage("Who's There");
-        System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
-    }
-
-    /**
-     * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function. <br>
-     * This function then places multiple callBack using the callbackIncrement function defined in
-     * callBack.ApiServiceImpl
-     * 
-     * @param aString String passed by a function call
-     */
-    public void multiCallBack(String aString) {
-
-        callback = this.getCallBackInterface();
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackApiServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackApiServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
-    }
-
-    /**
-     * This function does not callBack any function.
-     * 
-     * @param aString String passed by a function call
-     */
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-
-        return;
-
-    }
-
-    /**
-     * This function get an object of CallBackApiServiceImpl from the present componentContext
-     * 
-     * @param void
-     */
-    private CallBackApiCallBack getCallBackInterface() {
-        System.out.println("CallBackApiServiceImpl getting request context");
-        RequestContext rc = componentContext.getRequestContext();
-        System.out.println("CallBackApiServiceImpl getting callback from request context");
-        callback = rc.getCallback();
-        System.out.println("CallBackApiServiceImpl returning callback");
-        return callback;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/resources/CallBackApiTest.composite b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/resources/CallBackApiTest.composite
deleted file mode 100644
index 946c4862ee..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://callback"
-	name="CallBackApiTest">
- 	      
-    <component name="CallBackApiClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/>
-		<reference name="aCallBackService" target="CallBackApiService"/>
-    </component> 
-    
-    <component name="CallBackApiService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackApiServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 19eb25631e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback"
-    xmlns:t="http://callback">
-    <deployable composite="t:CallBackApiTest" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
deleted file mode 100644
index 9471049c74..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ /dev/null
@@ -1,62 +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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackApiTestCase extends TestCase {
-
-    private static SCADomain domain;
-    private CallBackApiClient aCallBackClient;
-
-    /**
-     * This function uses the Instance of CallBackApiClient.class <br>
-     * This function calls the run function defined in the CallBackApiClinet Interface <br>
-     * which in turn executes the following test cases. <br>
-     * 1. Basic callback patterns <br>
-     * 2. Test in which the target does not call back to the client <br>
-     * 3. Test in which the target calls back multiple times to the client.
-     */
-    public void testCallBackBasic() {
-        aCallBackClient.run();
-    }
-
-    /**
-     * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class
-     */
-    @Override
-    protected void setUp() throws Exception {
-        if (domain == null) {
-            domain = SCADomain.newInstance("CallBackApiTest.composite");
-        }
-
-        aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient");
-    }
-
-    /**
-     * This function destroys the SCADomain instance that was created in setUp()
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-basic/pom.xml
deleted file mode 100644
index abf27ffdea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-basic</artifactId>
-    <name>Apache Tuscany SCA Callback Basic Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
-    </properties>    
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
deleted file mode 100644
index 5e9d3d6821..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ /dev/null
@@ -1,33 +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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackBasicCallBack {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
deleted file mode 100644
index 9f4019f28c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackBasicClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
deleted file mode 100644
index e0e6d7eb8c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ /dev/null
@@ -1,135 +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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicClient.class)
-public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack {
-
-    @Reference
-    protected CallBackBasicService aCallBackService;
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-    private static Object monitor = new Object();
-
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-
-    private void test1a() {
-        aCallBackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test1b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-
-        return;
-    }
-
-    private void test1c() {
-        aCallBackService.multiCallBack("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallBackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount());
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallBackCount() {
-        return callBackCount;
-    }
-
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public void callBackMessage(String aString) {
-        System.out.println("Entering callback callBackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallBackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
deleted file mode 100644
index bd41fa7037..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ /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.    
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackBasicCallBack.class)
-/**
- * 
- */
-public interface CallBackBasicService {
-
-    public void knockKnock(String aString);
-
-    public void noCallBack(String aString);
-
-    public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
deleted file mode 100644
index 4ca2dc9af9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.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.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicService.class)
-public class CallBackBasicServiceImpl implements CallBackBasicService {
-
-    @Callback
-    protected CallBackBasicCallBack callback;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallBack(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        // System.out.println("CallBackBasicServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
deleted file mode 100644
index c506956088..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://callback"
-	name="CallBackBasicTest">
- 	      
-    <component name="CallBackBasicClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
-		<reference name="aCallBackService" target="CallBackBasicService"/>
-    </component> 
-    
-    <component name="CallBackBasicService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index adf28214f6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback"
-    xmlns:t="http://callback">
-    <deployable composite="t:CallBackBasicTest" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
deleted file mode 100644
index 32c26a348a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ /dev/null
@@ -1,50 +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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackBasicTestCase extends TestCase {
-
-    private static SCADomain domain;
-    private CallBackBasicClient aCallBackClient;
-
-    public void testCallBackBasic() {
-        aCallBackClient.run(); 
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-    	if( domain==null ) {
-    		domain = SCADomain.newInstance("CallBackBasicTest.composite");
-    	}
-    	
-        aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/pom.xml
deleted file mode 100644
index 561331560a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-complex-type</artifactId>
-    <name>Apache Tuscany SCA Callback Complex Type Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
deleted file mode 100644
index 9fddb850ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ /dev/null
@@ -1,33 +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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackCTypeCallBack {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
deleted file mode 100644
index 739983c277..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackCTypeClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
deleted file mode 100644
index d2b03fcde7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ /dev/null
@@ -1,142 +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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeClient.class)
-public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack {
-
-    @Reference
-    protected CallBackCTypeService aCallBackService;
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-    private static Object monitor = new Object();
-
-    public CallBackCTypeClientImpl() {
-    }
-
-    public void run() {
-
-        // This test is the same as the Basic Callback except it uses a
-        // componentType side file.
-        // This test currently fails because the integration test environment
-        // does not properly copy
-        // the componentType files to the target folder. This is documented in
-        // Tuscany-967.
-
-        // Test12a is the basic callback where the target calls back prior to
-        // returning to the client.
-        test12a();
-
-        // Test12b is where the target does not call back to the client.
-        test12b();
-
-        // Test12c is where the target calls back multiple times to the client.
-        test12c();
-
-        return;
-    }
-
-    private void test12a() {
-        aCallBackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test12b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1);
-        return;
-    }
-
-    private void test12c() {
-        aCallBackService.multiCallBack("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallBackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount());
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallBackCount() {
-        return callBackCount;
-    }
-
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public void callBackMessage(String aString) {
-        System.out.println("Entering callback callBackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallBackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
deleted file mode 100644
index ffbf4f35fa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-// @Callback(CallBackCTypeCallBack.class)
-/**
- * 
- */
-public interface CallBackCTypeService {
-
-    public void knockKnock(String aString);
-
-    public void noCallBack(String aString);
-
-    public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
deleted file mode 100644
index dc31ed156b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ /dev/null
@@ -1,62 +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.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeService.class)
-public class CallBackCTypeServiceImpl implements CallBackCTypeService {
-
-    @Callback
-    protected CallBackCTypeCallBack callback;
-
-    public CallBackCTypeServiceImpl() {
-    }
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackCTypeServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallBack(String aString) {
-
-        System.out.println("CallBackCTypeServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackCTypeServiceImpl message received: " + aString);
-        System.out.println("CallBackCTypeServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
deleted file mode 100644
index 3f48f16389..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://callback"
-	name="CallBackCTypeTest">
- 	      
-    <component name="CallBackCTypeClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeClientImpl"/>
-		<reference name="aCallBackService" target="CallBackCTypeService"/>
-    </component> 
-    
-    <component name="CallBackCTypeService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
deleted file mode 100644
index ff38134df5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ /dev/null
@@ -1,28 +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" >
-

-  <service name="CallBackCTypeService">

-     <interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService" 

-         callbackInterface="org.apache.tuscany.sca.test.CallBackCTypeCallBack"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
deleted file mode 100644
index 33d1afaecd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.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 org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class CallBackCTypeTestCaseFIXME extends TestCase {
-
-    private SCADomain domain;
-    private CallBackCTypeClient aCallBackClient;
-
-    public void testCallBackBasic() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackCTypeClient.composite");
-
-        aCallBackClient =
-            domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-id/pom.xml
deleted file mode 100644
index acd802e6ee..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-id</artifactId>
-    <name>Apache Tuscany SCA Callback ID Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
deleted file mode 100644
index b14560a8c3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ /dev/null
@@ -1,31 +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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackIdCallBack {
-
-    public void callBackMessage(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
deleted file mode 100644
index a9e551f8b4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackIdClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
deleted file mode 100644
index 59c9c3d069..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ /dev/null
@@ -1,147 +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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdClient.class)
-public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    protected ServiceReference<CallBackIdService> aCallBackService;
-
-    private static String returnMessage = null;
-    private static Object monitor = new Object();
-    private static Object callBackId;
-
-    public void run() {
-
-        // This tests the use of the set/get callbackId API both SCA generated
-        // and client specified.
-
-        // Test1 uses a SCA generated callback ID and compare that with the
-        // callbackID returned during callback.
-        test11a();
-
-        // Test2 uses a Client specified callback ID and compare that with the
-        // callbackID returned during callback.
-        test11b();
-
-        return;
-    }
-
-    private void test11a() {
-
-        // Retrieve this services callback ID and save it. Once the callback is
-        // received the callback ID will be compared with the one
-        // returned. Equal is good.
-
-        Object origCallBackId = aCallBackService.getCallbackID();
-        aCallBackService.getService().knockKnock("Knock Knock - Test1");
-        int count = 0;
-
-        // 
-        // If we cannot get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId());
-
-    }
-
-    private void test11b() {
-
-        // Set the services callback ID and save it. Once the callback is
-        // received the callback ID will be compared with the one
-        // returned. Equal is good.
-
-        String origCallBackId = "CallBackId1";
-        aCallBackService.setCallbackID(origCallBackId);
-
-        aCallBackService.getService().knockKnock("Knock Knock - Test2");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert
-            .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId());
-
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering callback callBackMessage: " + aString);
-        RequestContext rc = componentContext.getRequestContext();
-        Object callBackId = rc.getServiceReference().getCallbackID();
-
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            this.setCallBackId(callBackId);
-            monitor.notify();
-        }
-    }
-
-    protected Object getCallBackId() {
-        return callBackId;
-    }
-
-    protected void setCallBackId(Object aCallBackId) {
-        callBackId = aCallBackId;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
deleted file mode 100644
index 18c592a1c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ /dev/null
@@ -1,33 +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.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackIdCallBack.class)
-/**
- * 
- */
-public interface CallBackIdService {
-
-    public void knockKnock(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
deleted file mode 100644
index 8b0a4b69cf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdService.class)
-public class CallBackIdServiceImpl implements CallBackIdService {
-
-    @Callback
-    protected CallBackIdCallBack callback;
-    @Context
-    protected ComponentContext compositeContext;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackIdServiceImpl message received: " + aString);
-        RequestContext rc = compositeContext.getRequestContext();
-        Object callBackId = rc.getServiceReference().getCallbackID();
-        System.out.println("CallBackIdServiceImpl callbackID: " + callBackId);
-
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackIdServiceImpl response sent");
-        return;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/resources/CallBackIdClient.composite b/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/resources/CallBackIdClient.composite
deleted file mode 100644
index c9a6ba6258..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://callback"
-	name="CallBackIdTest">
- 	      
-    <component name="CallBackIdClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackIdClientImpl"/>
-		<reference name="aCallBackService" target="CallBackIdService"/>
-    </component> 
-    
-    <component name="CallBackIdService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackIdServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
deleted file mode 100644
index 771fbb8ff7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.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 org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackIdTestCase extends TestCase {
-
-    private SCADomain domain;
-    private CallBackIdClient aCallBackClient;
-
-    public void testCallBackBasic() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackIdClient.composite");
-
-        aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/pom.xml
deleted file mode 100644
index 2adb4570d4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-multiple-wires</artifactId>
-    <name>Apache Tuscany SCA Callback With Mutiple Wires Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
deleted file mode 100644
index 7c80d222fc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.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 org.apache.tuscany.sca.test.callback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
-    void aClientMethod();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
deleted file mode 100644
index df91f3d268..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ /dev/null
@@ -1,49 +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.test.callback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl1 implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        myService.someMethod("-> someMethod1");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl1.result = result;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
deleted file mode 100644
index a0a9564002..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ /dev/null
@@ -1,49 +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.test.callback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl2 implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        myService.someMethod("-> someMethod2");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl2.result = result;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
deleted file mode 100644
index cfd601f546..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ /dev/null
@@ -1,32 +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.test.callback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
deleted file mode 100644
index f198efae51..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.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 org.apache.tuscany.sca.test.callback;
-
-/**
- * The callback interface for {@link MyService}.
- */
-public interface MyServiceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
deleted file mode 100644
index d19b3fe355..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.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 org.apache.tuscany.sca.test.callback;
-
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(MyService.class)
-@Scope("COMPOSITE")
-public class MyServiceImpl implements MyService {
-
-    @Context
-    protected RequestContext requestContext;
-    
-    public void someMethod(String arg) {
-        // invoke the callback
-        try {
-            MyServiceCallback myServiceCallback = requestContext.getCallback();
-            myServiceCallback.receiveResult(arg + " -> receiveResult");
-        } catch(RuntimeException e) {
-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
deleted file mode 100644
index 3dae3ca3a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ /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.    

--->

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

-	targetNamespace="http://callback"

-	name="CallbackMultiWireTest">

-

-    <component name="MyClientComponent1">

-        <implementation.java class="org.apache.tuscany.sca.test.callback.MyClientImpl1"/>

-        <reference name="myService" target="MyServiceComponent"/>

-    </component>

-    

-    <component name="MyClientComponent2">

-        <implementation.java class="org.apache.tuscany.sca.test.callback.MyClientImpl2"/>

-        <reference name="myService" target="MyServiceComponent"/>

-    </component>

-    

-    <component name="MyServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.callback.MyServiceImpl"/>

-    </component>

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
deleted file mode 100644
index 3c83e4bedd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ /dev/null
@@ -1,55 +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.test.callback;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A TestCase that demonstrates resolving the client service and initiating the callback sequence
- */
-public class CallbackMultiWireTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private MyClient myClient1;
-    private MyClient myClient2;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite");
-        myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1");
-        myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient1.aClientMethod();
-        myClient2.aClientMethod();
-        System.out.println("Sleeping ...");
-        Thread.sleep(300);
-        assertEquals("-> someMethod1 -> receiveResult", MyClientImpl1.result);
-        assertEquals("-> someMethod2 -> receiveResult", MyClientImpl2.result);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/pom.xml
deleted file mode 100644
index afa5f91f49..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-separatethread</artifactId>
-    <name>Apache Tuscany SCA Callback Using Separate Thread Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
deleted file mode 100644
index f812a39058..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ /dev/null
@@ -1,34 +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.itest;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the client interface for the call backs in a separate thread tests 
- */
-@Remotable
-public interface CallBackSeparateThreadClient {
-
-    /**
-     * This tests call back patterns using separate threads.
-     */
-    void runTests();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
deleted file mode 100644
index e861f8a3d1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ /dev/null
@@ -1,172 +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.itest;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the client implementation for the call backs in a separate thread tests 
- */
-@Service(CallBackSeparateThreadClient.class)
-public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadClient, EventProcessorCallBack {
-    /**
-     * Used to sleep for 60 seconds.
-     */
-    private static final int SIXTY_SECONDS = 60 * 1000;
-
-    /**
-     * Counts the number of one second call backs
-     */
-    private static final AtomicInteger oneSecondCallbackCount = new AtomicInteger();
-
-    /**
-     * Counts the number of five second call backs
-     */
-    private static final AtomicInteger fiveSecondCallbackCount = new AtomicInteger();
-
-    /**
-     * This is our injected reference to the EventProcessorService
-     */
-    @Reference
-    protected EventProcessorService aCallBackService;
-
-    /**
-     * This tests call back patterns using separate threads.
-     */
-    public void runTests() {
-        // Register for 1 second call back
-        registerFor1SecondCallback();
-        
-        // Wait for a few 1 second call backs
-        System.out.println("Waiting for some 1 second calls");
-        waitForSome1SecondCallbacks();
-
-        // Register for 5 second call back
-        registerFor5SecondCallback();
-        
-        // Wait for a few 1 second call backs
-        System.out.println("Waiting for some 1 second calls");
-        waitForSome1SecondCallbacks();
-        
-        // Wait for a few 5 second call backs
-        System.out.println("Waiting for some 5 second calls");
-        waitForSome5SecondCallbacks();
-        
-        System.out.println("Done");
-    }
-
-    /**
-     * Waits for some one second call backs to be fired
-     */
-    private void waitForSome1SecondCallbacks() {
-        // Reset the one second call back count
-        oneSecondCallbackCount.set(0);
-        
-        // Wait until we have 10 1 second call backs or 60 seconds has passed
-        final long start = System.currentTimeMillis();
-        do {
-            if (oneSecondCallbackCount.get() >= 10) {
-                System.out.println("Received enough 1 second notifications");
-                return;
-            }
-            
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                Assert.fail("Unexpeceted exception " + e);
-            }
-        }
-        while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-        
-        // If we get to here then we did not receive enough events
-        Assert.fail("Did not receive enough 1 second events");
-    }
-
-    /**
-     * Waits for some five second call backs to be fired
-     */
-    private void waitForSome5SecondCallbacks() {
-        // Reset the five second call back count
-        fiveSecondCallbackCount.set(0);
-        
-        // Wait until we have 4 5 second call backs or 60 seconds has passed
-        final long start = System.currentTimeMillis();
-        do
-        {
-            if (fiveSecondCallbackCount.get() >= 4) {
-                System.out.println("Received enough 5 second notifications");
-                return;
-            }
-            
-            try
-            {
-                Thread.sleep(500);
-            }
-            catch (InterruptedException e)
-            {
-                Assert.fail("Unexpeceted exception " + e);
-            }
-        }
-        while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-        
-        // If we get to here then we did not receive enough events
-        Assert.fail("Did not receive enough 5 second events");
-    }
-    
-    /**
-     * Register to receive one second call backs
-     */
-    private void registerFor1SecondCallback() {
-        aCallBackService.registerForEvent("ONE");
-        return;
-    }
-
-    /**
-     * Register to receive five second call backs
-     */
-    private void registerFor5SecondCallback() {
-        aCallBackService.registerForEvent("FIVE");
-    }
-
-    /**
-     * Method that is called when an Event is delivered.
-     * 
-     * @param aEventName The name of the Event
-     * @param aEventData The Event data
-     */
-    public void eventNotification(String aEventName, Object aEventData) {
-        // System.out.println("Received Event : " + aEventName + " " + aEventData);
-
-        if (aEventName.equals("ONE")) {
-            final int newValue = oneSecondCallbackCount.incrementAndGet();
-            //System.out.println("Received total of " + newValue + " 1 second call backs");
-        } else if (aEventName.equals("FIVE")) {
-            final int newValue = fiveSecondCallbackCount.incrementAndGet();
-            //System.out.println("Received total of " + newValue + " 5 second call backs");
-        }
-        else
-            System.out.println("Unknown event type of " + aEventName);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
deleted file mode 100644
index ae41f596fc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.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 org.apache.tuscany.sca.itest;
-
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The call back interface for the EventProcessorService that is implemented
- * by the client to receive event notifications
- */
-@Remotable
-public interface EventProcessorCallBack {
-    /**
-     * Call back notifying client of an Event
-     * 
-     * @param aEventName The name of the Event
-     * @param aEventData The data for the Event
-     */
-    void eventNotification(String aEventName, Object aEventData);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
deleted file mode 100644
index c22b8cceec..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.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 org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * Sample Event Processor Service 
- */
-@Conversational
-@Callback(EventProcessorCallBack.class)
-@Remotable
-public interface EventProcessorService {
-
-    /**
-     * Registers the client to receive notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to register
-     */
-    void registerForEvent(String aEventName);
-
-    /**
-     * Unregisters the client so it no longer receives notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to unregister
-     */
-    void unregisterForEvent(String aEventName);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
deleted file mode 100644
index 4d672b3a8b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ /dev/null
@@ -1,197 +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.itest;
-
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Sample Event Processor Service Implementation 
- */
-@Service(EventProcessorService.class)
-@Scope("CONVERSATION")
-public class EventProcessorServiceImpl implements EventProcessorService {
-
-    /**
-     * Reference to the call back
-     */
-    @Callback
-    protected CallableReference<EventProcessorCallBack> clientCallback;
-    
-    /**
-     * This map contains the call backs for each of the registered Event names
-     */
-    private final Map<String, CallableReference<EventProcessorCallBack>> eventListeners; 
-    
-    /**
-     * The list of all Event Generators we create
-     */
-    private final EventGenerator[] allEventGenerators;
-    
-    /**
-     * Constructor. Starts the Event Generators
-     */
-    public EventProcessorServiceImpl() {
-        eventListeners = new ConcurrentHashMap<String, CallableReference<EventProcessorCallBack>>();
-        
-        // We will simulate an Event generator
-        allEventGenerators = new EventGenerator[2];
-        allEventGenerators[0] = new EventGenerator("ONE", 1);      // Generate the SECOND event every second
-        allEventGenerators[1] = new EventGenerator("FIVE", 5);     // Generate the FIVE event every 5 seconds
-    }
-    
-    /**
-     * Registers the client to receive notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to register
-     */
-    public void registerForEvent(String aEventName)
-    {
-        // Register for the Event
-        eventListeners.put(aEventName, clientCallback);
-        
-        // Send the "register" started event to the client
-        receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName);
-    }
-
-    /**
-     * Unregisters the client so it no longer receives notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to unregister
-     */
-    public void unregisterForEvent(String aEventName)
-    {
-        // Send the "register" started event to the client
-        receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName);
-        
-        eventListeners.remove(aEventName);
-    }
-    
-    /**
-     * This method is called whenever the EventProcessorService receives an Event
-     * 
-     * @param aEventName The name of the Event received
-     * @param aEventData The Event data
-     */
-    private void receiveEvent(String aEventName, Object aEventData)
-    {
-        // Get the listener for the Event
-        final CallableReference<EventProcessorCallBack> callback = eventListeners.get(aEventName);
-        if (callback == null)
-        {
-            //System.out.println("No registered listeners for " + aEventName);
-            return;
-        }
-        
-        // Trigger the call back
-        // System.out.println("Notifying " + callback + " of event " + aEventName);
-        callback.getService().eventNotification(aEventName, aEventData);
-        // System.out.println("Done notify " + callback + " of event " + aEventName);
-    }
-    
-    /**
-     * Shuts down the Event Processor
-     */
-    @Destroy
-    public void shutdown()
-    {
-        System.out.println("Shutting down the EventProcessor");
-        
-        // Clear list of call back locations as we don't want to send any more notifications
-        eventListeners.clear();
-
-        // Stop the Event Generators
-        for (EventGenerator generator : allEventGenerators)
-        {
-            generator.stop();
-        }
-    }
-    
-    /**
-     * Utility class for generating Events
-     */
-    private class EventGenerator
-    {
-        /**
-         * The Timer we are using to generate the events
-         */
-        private final Timer timer = new Timer();
-        
-        /**
-         * Constructor
-         *
-         * @param aEventName The name of the Event to generate
-         * @param frequencyInSeconds How frequently we should generate the Events
-         */
-        private EventGenerator(String aEventName, int frequencyInSeconds)
-        {
-            timer.schedule(new EventGeneratorTimerTask(aEventName), 
-                    frequencyInSeconds * 1000, frequencyInSeconds * 1000);
-        }
-        
-        /**
-         * Stop this Event Generator
-         */
-        private void stop()
-        {
-            timer.cancel();
-        }
-        
-        /**
-         * The TimerTask that is invoked by the Timer for the EventGenerator
-         */
-        private class EventGeneratorTimerTask extends TimerTask
-        {
-            /**
-             * The name of the Event we should generate
-             */
-            private final String eventName;
-
-            /**
-             * Constructor
-             *
-             * @param aEventName The name of the Event we should generate
-             */
-            private EventGeneratorTimerTask(String aEventName)
-            {
-                eventName = aEventName;
-            }
-
-            /**
-             * Timer calls this method and it will generate an Event
-             */
-            @Override
-            public void run()
-            {
-                // System.out.println("Generating new event " + eventName);
-                receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString());
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
deleted file mode 100644
index e111e5074c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ /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.

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback" name="CallBackSeparateThreadTest">

- 	      

-    <component name="CallBackSeparateThreadClient">

-		<implementation.java class="org.apache.tuscany.sca.itest.CallBackSeparateThreadClientImpl"/>

-		<reference name="aCallBackService" target="EventProcessorService"/>

-    </component> 

-    

-    <component name="EventProcessorService">

-      <implementation.java class="org.apache.tuscany.sca.itest.EventProcessorServiceImpl"/>

-    </component>  

-  

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
deleted file mode 100644
index f7e7be2133..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ /dev/null
@@ -1,64 +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.itest;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This test case will attempt to trigger a call back using a separate thread
- */
-public class CallBackSeparateThreadTestCase extends TestCase {
-
-    /**
-     * The SCADomain we are using 
-     */
-    private SCADomain domain;
-    
-    /**
-     * The client the tests should use
-     */
-    private CallBackSeparateThreadClient aCallBackClient;
-
-    /**
-     * Run the call back in separate thread tests
-     */
-    public void testCallBackSeparateThread() {
-        aCallBackClient.runTests(); 
-    }
-
-    /**
-     * Load the Call back in separate thread composite and look up the client.
-     */
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackSeparateThreadTest.composite");
-        aCallBackClient = domain.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient");
-    }
-
-    /**
-     * Shutdown the SCA domain
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/pom.xml
deleted file mode 100644
index acbd16303e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-set-callback</artifactId>
-    <name>Apache Tuscany SCA Set Callback Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
deleted file mode 100644
index 3b9599f53f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ /dev/null
@@ -1,34 +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.test;
-
-import org.osoa.sca.annotations.Callback;
-
-// @Remotable
-@Callback(CallBackSetCallbackCallback.class)
-/**
- * 
- */
-public interface CallBackSetCalbackService {
-
-    public void knockKnock(String aString);
-
-    public boolean setCallbackIllegally(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
deleted file mode 100644
index 48752f2ea1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.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 org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackBadCallback {
-
-    public CallBackSetCallbackBadCallback() {
-        super();
-    }
-
-    public void callback(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("CallBackSetCallbackBadCallback: callback called");
-        Assert.fail("CallBackSetCallbackBadCallback: callback called");
-        return;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
deleted file mode 100644
index ad0e0603a3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ /dev/null
@@ -1,31 +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.test;
-
-// @Remotable
-/**
- *
- */
-public interface CallBackSetCallbackCallback {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
deleted file mode 100644
index 0a22b0e01f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ /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.    
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackCallback.class)
-public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback {
-
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallBackCount() {
-        return callBackCount;
-    }
-
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering CallBackSetCallbackCallbackImpl callBackMessage: " + aString);
-
-        File aFile = new File("target/test4_marker");
-        try {
-            aFile.createNewFile();
-        } catch (Exception ex) {
-            System.out.println("Error Creating target/test4_marker marker file");
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        this.incrementCallBackCount();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
deleted file mode 100644
index 94cb6aa73b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
deleted file mode 100644
index 66e4d3fc05..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ /dev/null
@@ -1,190 +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.test;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackClient.class)
-public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient {
-
-    @Reference
-    protected ServiceReference<CallBackSetCalbackService> aCallBackService;
-    @Reference
-    protected ServiceReference<CallBackSetCallbackCallback> callBack;
-
-    public void run() {
-
-        // This test various aspects of the setCallback() API in a stateless
-        // scope.
-
-        /*
-         * test4 Client does not implement the callback interface but calls
-         * setCallback with a service reference before invoking the target,
-         * Verify successful execution.
-         */
-
-        test4();
-
-        /*
-         * test5 The client does not implement the callback interface and does
-         * not call setCallback() before invoking the target. Verify a
-         * NoRegisteredCallbackException is thrown.
-         */
-
-        test5();
-
-        /*
-         * test6() The client calls setCallback() with an object that is not a
-         * service reference and the callback interface is stateless. Verify
-         * that an appropriate exception is thrown. When calling setCallback
-         * with an object the interface must be stateful. Stateless interfaces
-         * require a service Reference.
-         */
-
-        test6();
-
-        /*
-         * test10 The target calls setCallback() on its own service reference,
-         * e.g. getRequestContext().getServiceReference().getCallback(). Verify
-         * an appropriate exception occurs.
-         */
-
-        test10();
-
-        return;
-    }
-
-    private void test4() {
-
-        //
-        // Since callbacks do not synchronously return and this test results in
-        // a callback to a component other
-        // than this client I am using a marker file to determine the outcome.
-        // The presence of the marker
-        // file will be used for the Assertion test. If it exists then the
-        // callback occurred and all is good.
-        //
-
-        // Make sure the marker file is not present before starting the test.
-        File aFile = new File("target/test4_marker");
-        if (aFile.exists())
-            aFile.delete();
-
-        aCallBackService.setCallback(callBack);
-
-        aCallBackService.getService().knockKnock("Knock Knock");
-
-        // Lets give the callback a little time to complete....
-
-        int count = 0;
-        long timeout = 1000;
-
-        while (count++ < 30 && (aFile.exists() == false)) {
-            try {
-                Thread.sleep(timeout);
-            } catch (InterruptedException ie) {
-            }
-        }
-
-        Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists());
-
-        aCallBackService.setCallback(null);  // leave this in the default state for next test
-
-    }
-
-    private void test5() {
-
-        boolean correctException = false;
-
-        //
-        // The backend service is expecting a callback reference to be set. This
-        // test will not
-        // set one so an exception is expected. According to the spec if a
-        // client calls a method on
-        // a service reference prior to calling setCallback() then a
-        // NoRegisteredCallbackException
-        // will be thrown on the client.
-        //
-
-        try {
-            aCallBackService.getService().knockKnock("Knock Knock");
-        } catch (NoRegisteredCallbackException NotRegEx) {
-            correctException = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallback - Test5", true, correctException);
-
-    }
-
-    private void test6() {
-
-        boolean correctException = false;
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does implement
-        // the callback interface. However because this callback service is
-        // stateless the expected
-        // result is an appropriate exception.
-        //
-
-        try {
-            aCallBackService.setCallback(new CallBackSetCallbackObjectCallback());
-            aCallBackService.getService().knockKnock("Knock Knock");
-        }
-        //
-        // This should catch an appropriate exception.
-        //
-        catch (IllegalArgumentException goodEx) {
-            correctException = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallback - Test6", true, correctException);
-
-    }
-
-    private void test10() {
-
-        //
-        // The appropriate exception should be thrown and caught on the service side.
-        // If this happens, the setCallbackIllegally() method will return true.
-        // If not, this method will return false.
-        //
-
-        aCallBackService.setCallback(callBack);  // ensure no client-side exception
-
-        boolean result = aCallBackService.getService().setCallbackIllegally
-                             ("Try to set callback on your own service reference");
-
-        Assert.assertEquals("CallBackSetCallback - Test10", true, result);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
deleted file mode 100644
index afedcdf7f1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ /dev/null
@@ -1,44 +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.test;
-
-public class CallBackSetCallbackObjectCallback implements CallBackSetCallbackCallback {
-
-    private int callBackCount = 0;
-
-    public CallBackSetCallbackObjectCallback() {
-        super();
-    }
-
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        this.incrementCallBackCount();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
deleted file mode 100644
index 4a6c9dbaa6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ /dev/null
@@ -1,73 +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.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCalbackService.class)
-public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService {
-
-    @Callback
-    protected CallBackSetCallbackCallback callback;
-    @Context
-    protected ComponentContext context;
-
-    public void knockKnock(String aString) {
-
-        try {
-            System.out.println("CallBackBasicServiceImpl message received: " + aString);
-            callback.callBackMessage("Who's There");
-            System.out.println("CallBackBasicServiceImpl response sent");
-            return;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public boolean setCallbackIllegally(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
-        boolean exceptionProduced = false;
-        RequestContext requestContext = null;
-        ServiceReference serviceRef = null;
-
-        try {
-            requestContext = context.getRequestContext();
-            serviceRef = (ServiceReference) requestContext.getServiceReference();
-            serviceRef.setCallback(serviceRef);
-        } catch (ClassCastException goodEx) {
-            exceptionProduced = true;
-            System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
-        } catch (Exception badEx) {
-            System.out.println("CallBackBasicServiceImpl.setCallbackIllegally()  " + badEx.toString());
-            badEx.printStackTrace();
-        }
-
-        // Return a flag indicating whether we got the exception we are looking for
-        return exceptionProduced;
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
deleted file mode 100644
index 3552ddecab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://callback"
-	name="CallBackSetCallbackTest">
- 	      
-    <component name="CallBackSetCallbackClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackClientImpl"/>
-		<reference name="aCallBackService" target="CallBackSetCallbackService"/>
-		<reference name="callBack" target="CallBackSetCallbackCallback"/>
-    </component> 
-    
-    <component name="CallBackSetCallbackCallback">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackCallbackImpl"/>
-	</component> 
-    
-    <component name="CallBackSetCallbackService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackServiceImpl"/>
-    </component>    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
deleted file mode 100644
index 496ae0b1a5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ /dev/null
@@ -1,49 +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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class CallBackSetCallbackTestCase extends TestCase {
-
-    private SCADomain domain;
-    private CallBackSetCallbackClient aCallBackClient;
-
-    public void testCallBackSetCallback() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-    	domain = SCADomain.newInstance("CallBackSetCallbackTest.composite");
-    	
-        aCallBackClient =
-            domain.getService(CallBackSetCallbackClient.class,
-                                                               "CallBackSetCallbackClient");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/pom.xml b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/pom.xml
deleted file mode 100644
index 237802c64e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-set-conversation</artifactId>
-    <name>Apache Tuscany SCA Callback Set Conversation Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
deleted file mode 100644
index d97c69eaed..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.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 org.apache.tuscany.sca.test;
-
-import java.io.Serializable;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvBadCallback implements Serializable {
-
-    public CallBackSetCallbackConvBadCallback() {
-        super();
-    }
-
-    public void callback(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("CallBackSetCallbackBadCallback: callback called");
-        Assert.fail("CallBackSetCallbackConvBadCallback: callback called");
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
deleted file mode 100644
index a704fd0ece..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ /dev/null
@@ -1,34 +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.test;
-
-import org.osoa.sca.annotations.Conversational;
-
-// @Remotable
-@Conversational
-/**
- *
- */
-public interface CallBackSetCallbackConvCallback {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
deleted file mode 100644
index 013424bf5e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackConvClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
deleted file mode 100644
index 5d692e7728..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ /dev/null
@@ -1,163 +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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvClient.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackConvClient {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    protected CallBackSetCallbackConvService aCallBackService;
-
-    private CallBackSetCallbackConvObjectCallback aCallbackObject = null;
-
-    public void run() {
-
-        // This tests aspects of the setCallback() API within a conversational
-        // scope.
-
-        /*
-         * test7 The client calls setCallback() with an object that is not a
-         * service reference and the callback interface is stateful. Verify
-         * successful execution.
-         */
-        test7();
-
-        /*
-         * test8() The client calls setCallback() with an object that does not
-         * implement the callback interface. Verify an appropriate exception is
-         * thrown. This requires a STATEFUL interface.
-         */
-        test8();
-
-        /*
-         * test9 The client calls setCallback() with an object that is not
-         * Serializable. Verify an appropriate exception is thrown. This
-         * requires a STATEFUL callback interface. Move from the stateless test
-         * case.
-         */
-        test9();
-
-        return;
-    }
-
-    private void test7() {
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does implement
-        // the callback interface and is Serializable. Verify successful
-        // execution.
-        //	
-
-        aCallbackObject = new CallBackSetCallbackConvObjectCallback();
-        aCallbackObject.incrementCallBackCount();
-
-        ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                = componentContext.cast(aCallBackService);
-        aCallBackServiceRef.setCallback(aCallbackObject);
-        aCallBackService.knockKnock("Knock Knock 7");
-
-        Assert.assertEquals("CallBackSetCallbackConv - Test7", 2, aCallbackObject.getCount());
-
-    }
-
-    private void test8() {
-
-        boolean correctException = false;
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does not implement
-        // the callback interface. The expected result is an appropriate
-        // exception.
-        //
-
-        try {
-            ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                    = componentContext.cast(aCallBackService);
-            aCallBackServiceRef.setCallback(new CallBackSetCallbackConvBadCallback());
-            aCallBackService.knockKnock("Knock Knock 8");
-        }
-
-        //
-        // This should catch an appropriate exception.
-        // 
-
-        catch (IllegalArgumentException goodEx)
-        {
-            System.out.println("correct exception " + goodEx);
-            correctException = true;
-        }
-
-        catch (Exception ex) {
-            // This means an inappropriate exception occurred
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallbackConv - Test8", true, correctException);
-
-    }
-
-    private void test9() {
-
-        boolean correctException = false;
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does implement
-        // the callback interface but does not implement Serializable. Verify
-        // an appropriate exception
-        // is thrown.
-        //
-
-        try {
-            ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                    = componentContext.cast(aCallBackService);
-            aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback());
-            aCallBackService.knockKnock("Knock Knock 9");
-        }
-        //
-        // This should catch an appropriate exception.
-        //
-        catch (IllegalArgumentException goodEx)
-        {
-            System.out.println("correct exception " + goodEx);
-            correctException = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallbackConv - Test9", true, correctException);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
deleted file mode 100644
index 75a4a3a6a0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ /dev/null
@@ -1,56 +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.test;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback {
-
-    private int callBackCount = 0;
-
-    public CallBackSetCallbackConvNonSerCallback() {
-        super();
-    }
-
-    public synchronized void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public synchronized int getCount() {
-        return callBackCount;
-    }
-
-    public void callBackMessage(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString);
-        Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackMessage called");
-    }
-
-    public void callBackIncrement(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("Entering callbackIncrement: " + aString);
-        this.incrementCallBackCount();
-        Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackIncrement called");
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
deleted file mode 100644
index e7a3b144f6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ /dev/null
@@ -1,52 +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.test;
-
-import java.io.Serializable;
-
-public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable
-{
-    private int callBackCount = 0;
-
-    public CallBackSetCallbackConvObjectCallback() {
-        super();
-    }
-
-    public synchronized void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public synchronized int getCount() {
-        return callBackCount;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
-    }
-
-    public void callBackIncrement(String aString) {
-
-        System.out.println("Entering callback increment: " + aString);
-
-        this.incrementCallBackCount();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
deleted file mode 100644
index 692b6dfc35..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.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 org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-// @Remotable
-@Conversational
-@Callback(CallBackSetCallbackConvCallback.class)
-/**
- * 
- */
-public interface CallBackSetCallbackConvService {
-
-    public void knockKnock(String aString);
-
-    public void setCallbackIllegally(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
deleted file mode 100644
index bca94ce407..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ /dev/null
@@ -1,98 +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.test;
-
-import java.io.File;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvService.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackConvService {
-
-    @Callback
-    protected CallBackSetCallbackConvCallback callback;
-    @Context
-    protected ComponentContext context;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackSetCallbackConvServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        callback.callBackIncrement("This should do it");
-        System.out.println("CallBackSetCallbackConvServiceImpl response sent");
-
-    }
-
-    public void setCallbackIllegally(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
-        boolean exceptionProduced = false;
-        RequestContext requestContext = null;
-        ServiceReference serviceRef = null;
-
-        // Context is not working properly so we can't trust that this is
-        // working.....
-        try {
-            requestContext = context.getRequestContext();
-            serviceRef = (ServiceReference) requestContext.getServiceReference();
-        } catch (Exception ex) {
-            System.out.println("CallBackBasicServiceImpl.setCallbackIllegally()  " + ex.toString());
-            ex.printStackTrace();
-            return;
-        }
-
-        // Ok, call setCallback with my own service reference.
-        try {
-            serviceRef.setCallback(serviceRef);
-        } catch (NullPointerException npe) {
-            // This is not an appropriate exception.
-            System.out.println("Test10 NPE exception during setCallback to own service reference");
-            npe.printStackTrace();
-            return;
-        }
-        // This needs to catch the appropriate exception, once we figure out
-        // what is needs to be!
-        catch (Exception ex) {
-            exceptionProduced = true;
-            System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
-        }
-        ;
-
-        // If we get the exception we are looking for then create the marker
-        // file.
-        if (exceptionProduced == true) {
-            File aFile = new File("target/test10_marker");
-            try {
-                aFile.createNewFile();
-            } catch (Exception ex) {
-                System.out.println("Error Creating target/test10_marker marker file");
-                ex.printStackTrace();
-            }
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
deleted file mode 100644
index ce73417f94..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://callback"
-	name="CallBackSetCallbackConvTest">
- 	      
-    <component name="CallBackSetCallbackConvClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvClientImpl"/>
-		<reference name="aCallBackService" target="CallBackSetCallbackConvService"/>
-    </component>    
-   
-    
-    <component name="CallBackSetCallbackConvService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvServiceImpl"/>
-    </component>    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
deleted file mode 100644
index 45bdaea9ab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.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 org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackSetCallbackConvTestCase extends TestCase {
-
-    private SCADomain domain;
-    private CallBackSetCallbackConvClient aCallBackClient;
-
-    public void testCallBackSetCallback() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-    	domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite");
-    	
-        aCallBackClient =
-            domain.getService(CallBackSetCallbackConvClient.class,
-                                                               "CallBackSetCallbackConvClient");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/pom.xml b/tags/java/sca/1.3-RC1a/itest/component-type/pom.xml
deleted file mode 100644
index cc92efabe1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/pom.xml
+++ /dev/null
@@ -1,47 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-component-type</artifactId>
-    <name>Apache Tuscany SCA Component Type Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-</project>
-
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/AddService.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/AddService.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 calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 8b6fe066a6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        return n1 + n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 08afd922b3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorClient.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 calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ /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.    
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 1209ac128a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,63 +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 calculator;
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/DivideService.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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/MultiplyService.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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/SubtractService.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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 77b128ab8d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/Calculator.composite
deleted file mode 100644
index b229787657..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/Calculator.composite
+++ /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.    

--->

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

-           targetNamespace="http://sample"

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

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent/AddService"/>

-        <reference name="subtractService" target="SubtractServiceComponent/SubtractService"/>

-        <reference name="multiplyService" target="MultiplyServiceComponent/MultiplyService"/>

-        <reference name="divideService" target="DivideServiceComponent/DivideService"/>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
deleted file mode 100644
index 00c48e5a35..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ /dev/null
@@ -1,27 +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">

-
-  <service name="AddService">

-     <interface.java interface="calculator.AddService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
deleted file mode 100644
index 74bedc0a98..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,43 +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">

-
-  <service name="CalculatorService">

-     <interface.java interface="calculator.CalculatorService"/> 

-  </service>

-

-  <reference name="addService">

-     <interface.java interface="calculator.AddService"/>

-  </reference>

-

-  <reference name="subtractService">

-     <interface.java interface="calculator.SubtractService"/>

-  </reference>

-

-  <reference name="multiplyService">

-     <interface.java interface="calculator.MultiplyService"/>

-  </reference>

-

-  <reference name="divideService">

-     <interface.java interface="calculator.DivideService"/>

-  </reference>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
deleted file mode 100644
index 289fcc3e11..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ /dev/null
@@ -1,27 +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">

-
-  <service name="DivideService">

-     <interface.java interface="calculator.DivideService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
deleted file mode 100644
index 2d8a879cda..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ /dev/null
@@ -1,27 +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">

-
-  <service name="MultiplyService">

-     <interface.java interface="calculator.MultiplyService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
deleted file mode 100644
index 6214955141..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ /dev/null
@@ -1,27 +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">

-
-  <service name="SubtractService">

-     <interface.java interface="calculator.SubtractService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.3-RC1a/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 08fc8e33bf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,52 +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 calculator;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CalculatorTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCADomain scaDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("Calculator.composite");
-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testCalculator() throws Exception {
-        // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/build-jar.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/build-jar.xml
deleted file mode 100644
index 299ce6864f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ /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.
--->
-<project name="JarCreator">
-
-    <target name="create-jar">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
-
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-
-        <delete file="target/classes/META-INF/sca-contribution.xml"/>
-    </target>
-
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/pom.xml
deleted file mode 100644
index 25f25edc4e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/pom.xml
+++ /dev/null
@@ -1,203 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-classloader-classes</artifactId>
-    <name>Apache Tuscany Contribution ClassLoader Test : Contribution Classes</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>itest-contribution-classloader-classes</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-jar</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChain.jar" />
-                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/supplychain.composite \
-                                               supplychain/warehouse/JavaWarehouseComponentImpl.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CompleteSupplyChain.jar" />
-                                    <property name="sca.contribution" value="complete-supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/supplychain.composite \
-                                               supplychain/customer/* \
-                                               supplychain/retailer/* \
-                                               supplychain/warehouse/* \
-                                               supplychain/shipper/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer.jar" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Retailer.jar" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Shipper.jar" />
-                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Warehouse.jar" />
-                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="IllegalSupplyChain1.jar" />
-                                    <property name="sca.contribution" value="illegal1-supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/illegalsupplychain.composite \
-                                               supplychain/warehouse/JavaWarehouseComponentImpl.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="IllegalSupplyChain2.jar" />
-                                    <property name="sca.contribution" value="illegal2-supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/illegalsupplychain.composite \
-                                               supplychain/warehouse/JavaWarehouseComponentImpl.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="IllegalCustomer.jar" />
-                                    <property name="sca.contribution" value="illegal-customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/illegal/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerInterface.jar" />
-                                    <property name="sca.contribution" value="customer-interface-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerImpl.jar" />
-                                    <property name="sca.contribution" value="customer-impl-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/JavaCustomerComponentImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 814c38777a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ /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.    
- */
-package supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-    
-    public int outstandingOrderCount();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4daf0ec02..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,63 +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 supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private static int outstandingOrderCount;
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        outstandingOrderCount++;
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrderCount--;
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public int outstandingOrderCount() {
-        return outstandingOrderCount;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4b3bc7048..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,74 +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 supplychain.illegal;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-import supplychain.retailer.JavaRetailerComponentImpl;
-import supplychain.retailer.Retailer;
-import supplychain.warehouse.JavaWarehouseComponentImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private static int outstandingOrderCount;
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        
-        Retailer retailerImpl = new JavaRetailerComponentImpl();
-        System.out.println("Created a retailer from Customer " + retailerImpl);
-        
-        Warehouse warehouseImpl = new JavaWarehouseComponentImpl();
-        System.out.println("Created a warehouse from Customer " + warehouseImpl);
-
-        outstandingOrderCount++;
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrderCount--;
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public int outstandingOrderCount() {
-        return outstandingOrderCount;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 698aa2aa5d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,61 +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 supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-     
-    public Warehouse getWarehouse() {
-        return warehouse;
-    }
-
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 9e01f00a79..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,52 +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 supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index cdd12d589d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import org.osoa.sca.annotations.Scope;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
deleted file mode 100644
index 714d1826e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-              
-   <deployable composite="supplychain:supplychain"/>
-   
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 8a2bec308f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
deleted file mode 100644
index c77c4c1c7e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <export.java package="supplychain.illegal"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
deleted file mode 100644
index d118cceef9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.illegal"/>
-   <import.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-   
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d37b6659da..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 77b28d9023..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 8ec290a831..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-              
-   <deployable composite="supplychain:supplychain"/>
-   
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index 1398416978..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
deleted file mode 100644
index db1f0d34e7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ /dev/null
@@ -1,48 +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://www.osoa.org/xmlns/sca/1.0"

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

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.illegal.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ /dev/null
@@ -1,48 +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://www.osoa.org/xmlns/sca/1.0"

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

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
deleted file mode 100644
index a76fae8090..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="JavaWarehouseComponentImpl">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/pom.xml
deleted file mode 100644
index 0545ac8216..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/pom.xml
+++ /dev/null
@@ -1,60 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-classloader-test</artifactId>
-    <name>Apache Tuscany Contribution Classloader tests</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
deleted file mode 100644
index 692f16f6f6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ /dev/null
@@ -1,373 +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.test.contribution;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URLClassLoader;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * 
- * Contribution ClassLoading integration tests
- */
-
-public class ContributionTestCase {
-
-    private SupplyChain supplyChain;
-    
-    
-    @Before
-    public void setUp() throws Exception {
-        supplyChain = new SupplyChain();
-    }
-	
-
-	@After
-    public void tearDown() throws Exception {
-
-        supplyChain.tearDown();
-        
-	}
-
-   
-    /**
-     * Test static ClassLoading for classes that are visible from contribution
-     * 
-     * @throws Exception
-     */
-    public void staticClassLoadingTestForVisibleClasses() throws Exception {
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class<?> customerClass = customerClassRef.getJavaClass();
-        
-        Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromContribution);
-        
-        Object customer = supplyChain.getCustomer(customerClass);
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-
-        m = customerClass.getMethod("outstandingOrderCount");
-        
-        int retries = 10;
-        int outstandingCount = 1;
-        while (retries-- > 0) {
-        
-            outstandingCount = (int)(Integer)m.invoke(customer);
-            if (outstandingCount == 0)
-                break;
-            else
-                Thread.sleep(100);
-        }
-        Assert.assertEquals(0, outstandingCount);
-        
-        
-    }
-    
-
-    /**
-     * Test dynamic ClassLoading for classes that are visible from contribution
-     * 
-     * @throws Exception
-     */
-    public void dynamicClassLoadingTestForVisibleClasses() throws Exception {
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        Contribution retailerContribution = supplyChain.getContribution("Retailer");
-        Contribution warehouseContribution = supplyChain.getContribution("Warehouse");
-        Contribution shipperContribution = supplyChain.getContribution("Shipper");
-        Contribution supplyChainContribution = supplyChain.getContribution("SupplyChain");
-        
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class customerClass = customerClassRef.getJavaClass();
-        
-        Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromContribution);
-        
-        Object customer = supplyChain.getCustomer(customerClass);
-        Assert.assertTrue(customerClass.isInstance(customer));
-        
-        ClassReference retailerClassRef = new ClassReference("supplychain.retailer.Retailer");
-        retailerClassRef = retailerContribution.getModelResolver().resolveModel(ClassReference.class, retailerClassRef);
-        Class retailerClass = retailerClassRef.getJavaClass();
-        
-        Class retailerClassFromContribution = retailerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
-        Assert.assertEquals(retailerClass, retailerClassFromContribution);
-        
-        Class retailerClassFromCustomer = customerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
-        Assert.assertEquals(retailerClass, retailerClassFromCustomer);
-        
-        ClassReference warehouseClassRef = new ClassReference("supplychain.warehouse.Warehouse");
-        warehouseClassRef = warehouseContribution.getModelResolver().resolveModel(ClassReference.class, warehouseClassRef);
-        Class warehouseClass = warehouseClassRef.getJavaClass();
-        
-        Class warehouseClassFromContribution = warehouseContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-        Assert.assertEquals(warehouseClass, warehouseClassFromContribution);
-        
-        Class warehouseClassFromRetailer = retailerContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-        Assert.assertEquals(warehouseClass, warehouseClassFromRetailer);
-        
-        ClassReference shipperClassRef = new ClassReference("supplychain.shipper.Shipper");
-        shipperClassRef = shipperContribution.getModelResolver().resolveModel(ClassReference.class, shipperClassRef);
-        Class shipperClass = shipperClassRef.getJavaClass();
-        
-        Class shipperClassFromContribution = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        Assert.assertEquals(shipperClass, shipperClassFromContribution);
-        
-        Class shipperClassFromWarehouse = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        Assert.assertEquals(shipperClass, shipperClassFromWarehouse);
-        
-        Class customerClassFromShipper = shipperContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromShipper);
-        
-        Class customerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromSupplyChain);
-        Class retailerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
-        Assert.assertEquals(retailerClass, retailerClassFromSupplyChain);
-        Class warehouseClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-        Assert.assertEquals(warehouseClass, warehouseClassFromSupplyChain);
-        Class shipperClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        Assert.assertEquals(shipperClass, shipperClassFromSupplyChain);
-        
-    }
-    
-    /**
-     * Test dynamic ClassLoading for classes that are visible from contribution
-     * 
-     * @throws Exception
-     */
-    public void dynamicClassLoadingTestForNonImportedClasses() throws Exception {
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        Contribution shipperContribution = supplyChain.getContribution("Shipper");
-        
-        Class customerClass = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer"); 
-        Class shipperClass = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        
-        try {
-            customerClass.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            customerClass.getClassLoader().loadClass("supplychain.shipper.JavaShipperComponentImpl");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        try {
-            Class.forName("supplychain.warehouse.Warehouse", true, customerClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            Class.forName("supplychain.shipper.JavaShipperComponentImpl", true, customerClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        try {
-            shipperClass.getClassLoader().loadClass("supplychain.warehouse.JavaWarehouseComponentImpl");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            shipperClass.getClassLoader().loadClass("supplychain.retailer.Retailer");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        try {
-            Class.forName("supplychain.warehouse.JavaWarehouseComponentImpl", true, shipperClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            Class.forName("supplychain.retailer.Retailer", true, shipperClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        
-    }
-    
-
-    /**
-     * This test ensures that classes from imported packages can be statically loaded 
-     * from other contributions even though the classes are not on CLASSPATH or on the 
-     * parent ClassLoader, or the thread context ClassLoader.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidStaticClassLoading() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader());
-        
-        staticClassLoadingTestForVisibleClasses();
-    }
-    
-    /**
-     * This test ensures that all imported classes are loaded from the exporting contributions 
-     * rather than the parent classLoader. If any of the interface classes were incorrectly loaded 
-     * through the parent ClassLoader, LinkageError should result.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidStaticClassLoadingWithContributionsInParentClassLoader() throws Exception {
-        
-        
-        URLClassLoader parentClassLoader = new URLClassLoader(
-                supplyChain.getContributionURLs(),
-                this.getClass().getClassLoader());
-
-        supplyChain.setUp(parentClassLoader);
-        
-        staticClassLoadingTestForVisibleClasses();
-    }
-    
-    
-    /**
-     * This test ensures that classes from imported packages can be dynamically loaded from
-     * other contributions even though the classes are not on CLASSPATH or on the 
-     * parent ClassLoader, or the thread context ClassLoader.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidDynamicClassLoading() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader());
-        
-        dynamicClassLoadingTestForVisibleClasses();
-    }
-    
-    /**
-     * This test ensures that all imported classes are dynamically loaded from the exporting 
-     * contributions rather  than the parent classLoader. If any of the interface classes were 
-     * incorrectly loaded through the parent, NoClassDefFoundError or LinkageError should result.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidDynamicClassLoadingWithContributionsInParentClassLoader() throws Exception {
-        
-        
-        URLClassLoader parentClassLoader = new URLClassLoader(
-                supplyChain.getContributionURLs(),
-                this.getClass().getClassLoader());
-
-        supplyChain.setUp(parentClassLoader);
-        
-        dynamicClassLoadingTestForVisibleClasses();
-    }
-    
-    @Test
-    public void testIllegalStaticClassLoading1() throws Exception {
-        // FIXME we have commented this code as we are not throwing exceptions anymore
-    	// need to deal with monitor logs to catch the errors.
-        
-    	/*try {
-            supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_1);
-        
-            Assert.fail("Composite containing unresolved references resolved incorrectly");
-        } catch (ContributionResolveException e) {
-        }*/
-    }
-    
-    @Test
-    public void testIllegalStaticClassLoading2() throws Exception {
-          
-        supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_2);
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class<?> customerClass = customerClassRef.getJavaClass();
-        
-        Object customer = supplyChain.getCustomer(customerClass);
-                
-        try {
-            Method m = customerClass.getMethod("purchaseGoods");
-            m.invoke(customer);
-            
-            Assert.fail("Classloading exception not thrown as expected");
-        } catch (InvocationTargetException e) {
-            
-            Throwable cause = e.getCause();
-            Assert.assertTrue(cause instanceof NoClassDefFoundError);
-            Assert.assertTrue(cause.getMessage().indexOf("JavaWarehouseComponentImpl") > -1);        }
-        
-    }
-    
-    /**
-     * This test ensures that classes from imported packages can be dynamically loaded from
-     * other contributions even though the classes are not on CLASSPATH or on the 
-     * parent ClassLoader, or the thread context ClassLoader.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testIllegalDynamicClassLoading() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader());
-        
-        dynamicClassLoadingTestForNonImportedClasses();
-    }
-    
-    
-    /**
-     * Self-contained contribution containing composites, componentType files and implementations
-     * should not require import/export statements for these files to find each other or for Tuscany
-     * to load these files.
-     * @throws Exception
-     */
-    @Test
-    public void testSelfContainedContribution() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SELFCONTAINED);
-        
-        staticClassLoadingTestForVisibleClasses();
-    }
-    
-    @Test
-    public void testContributionsWithSplitPackage() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SPLITPACKAGE);
-        
-        staticClassLoadingTestForVisibleClasses();
-        
-        dynamicClassLoadingTestForNonImportedClasses();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
deleted file mode 100644
index 1ec7aaaa3a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ /dev/null
@@ -1,231 +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.test.contribution;
-
-
-import java.io.File;
-import java.net.URL;
-import java.util.Hashtable;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.junit.Assert;
-
-/*
- * 
- * Contribution ClassLoading integration tests
- */
-
-public class SupplyChain {
-    
-    public static final int SUPPLYCHAIN = 0;
-    public static final int SUPPLYCHAIN_ILLEGAL_1 = 1;
-    public static final int SUPPLYCHAIN_ILLEGAL_2 = 2;
-    public static final int SUPPLYCHAIN_SELFCONTAINED = 3;
-    public static final int SUPPLYCHAIN_SPLITPACKAGE = 4;
-    
-    private String folderName = "../contribution-classes/target/classes";
-
-    private String customerJarName = "Customer";
-    private String retailerJarName = "Retailer";
-    private String warehouseJarName = "Warehouse";
-    private String shipperJarName = "Shipper";
-    private String supplychainJarName = "SupplyChain";
-    private String illegalSupplyChain1JarName = "IllegalSupplyChain1";
-    private String illegalSupplyChain2JarName = "IllegalSupplyChain2";
-    private String illegalCustomerJarName = "IllegalCustomer";
-    private String completeSupplychainJarName = "CompleteSupplyChain";
-    private String customerInterfaceJarName = "CustomerInterface";
-    private String customerImplJarName = "CustomerImpl";
-    
-    
-    private  EmbeddedSCADomain domain;
-    private ContributionService contributionService;
-    private int supplyChainVersion;
-        
-    private Hashtable<String, Contribution> contributions = new Hashtable<String, Contribution>();
-    
-    private URL customerContribURL;
-    private URL retailerContribURL;
-    private URL warehouseContribURL;
-    private URL shipperContribURL;
-    private URL supplyChainContribURL;
-    private URL illegalSupplyChain1ContribURL;
-    private URL illegalSupplyChain2ContribURL;
-    private URL illegalCustomerContribURL;
-    private URL completeSupplyChainContribURL;
-    private URL customerInterfaceContribURL;
-    private URL customerImplContribURL;
-    
-    public SupplyChain() throws Exception {
-        
-        customerContribURL = new File(folderName + "/" + customerJarName + ".jar").toURI().toURL();
-        retailerContribURL = new File(folderName + "/" + retailerJarName + ".jar").toURI().toURL();
-        warehouseContribURL = new File(folderName + "/" + warehouseJarName + ".jar").toURI().toURL();
-        shipperContribURL = new File(folderName + "/" + shipperJarName + ".jar").toURI().toURL();
-        supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURI().toURL();
-        illegalSupplyChain1ContribURL = new File(folderName + "/" + illegalSupplyChain1JarName + ".jar").toURI().toURL();
-        illegalSupplyChain2ContribURL = new File(folderName + "/" + illegalSupplyChain2JarName + ".jar").toURI().toURL();
-        illegalCustomerContribURL = new File(folderName + "/" + illegalCustomerJarName + ".jar").toURI().toURL();
-        completeSupplyChainContribURL = new File(folderName + "/" + completeSupplychainJarName + ".jar").toURI().toURL();
-        customerInterfaceContribURL = new File(folderName + "/" + customerInterfaceJarName + ".jar").toURI().toURL();
-        customerImplContribURL = new File(folderName + "/" + customerImplJarName + ".jar").toURI().toURL();
-    }
-    
-    public void setUp(ClassLoader parentClassLoader) throws Exception  {
-        this.setUp(parentClassLoader, SUPPLYCHAIN);
-    }
-    
-    public void setUp(ClassLoader parentClassLoader, int supplyChainVersion) throws Exception {
-        
-        this.supplyChainVersion = supplyChainVersion;
-        
-        Thread.currentThread().setContextClassLoader(parentClassLoader);
-        
-        //Create an embedded SCA domain
-        domain = new EmbeddedSCADomain(parentClassLoader, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        this.contributionService = domain.getContributionService();
-        
-        addContributions(supplyChainVersion);
-    }
-        
-    protected void addContributions(int supplyChainVersion) throws Exception {
-            
-        Contribution contribution;
-        
-        if (supplyChainVersion != SUPPLYCHAIN_SELFCONTAINED) {
-            contribution = contributionService.contribute("Shipper", shipperContribURL, true);
-            contributions.put("Shipper", contribution);
-            contribution = contributionService.contribute("Warehouse", warehouseContribURL, true);
-            contributions.put("Warehouse", contribution);
-            contribution = contributionService.contribute("Retailer", retailerContribURL, true);
-            contributions.put("Retailer", contribution);
-        }
-        
-        switch (supplyChainVersion) {
-        case SUPPLYCHAIN:
-            contribution = contributionService.contribute("Customer", customerContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_ILLEGAL_1:
-            contribution = contributionService.contribute("Customer", customerContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", illegalSupplyChain1ContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_ILLEGAL_2:
-            contribution = contributionService.contribute("Customer", illegalCustomerContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", illegalSupplyChain2ContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_SELFCONTAINED:
-            contribution = contributionService.contribute("SupplyChain", completeSupplyChainContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_SPLITPACKAGE:
-            contribution = contributionService.contribute("Customer", customerInterfaceContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("CustomerImpl", customerImplContribURL, true);
-            contributions.put("CustomerImpl", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        }
-        
-        // SUPPLYCHAIN_ILLEGAL_1 should throw an exception when the composite is resolved, and hence
-        // should not get this far.
-        Assert.assertTrue(supplyChainVersion != SUPPLYCHAIN_ILLEGAL_1);
-            
-        
-        for (Contribution c : contributions.values()) {
-
-            for (Composite deployable : c.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-        }
-            
-        // Start Components from my composite
-        for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-    }
-   
-    public void tearDown() throws Exception {
-        
-        if (domain == null)
-            return;
-        
-        for (String contributionURI : contributions.keySet()) {
-            contributionService.remove(contributionURI);
-        }
-
-
-        if (contributions.get("SupplyChain") != null) {
-            // Stop Components from my composite
-            for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-        }
-
-        domain.stop();
-
-        domain.close();
-    }
-
-    public Contribution getContribution(String uri) {
-        if (supplyChainVersion == SUPPLYCHAIN_SELFCONTAINED)
-            return contributions.get("SupplyChain");
-        else
-            return contributions.get(uri);
-    }
-    
-    public Object getCustomer(Class<?> customerClass) {
-        return domain.getService(customerClass, "CustomerComponent");
-    }
-      
-    public URL[] getContributionURLs() {
-        return new URL[] {
-                customerContribURL,
-                retailerContribURL,
-                warehouseContribURL,
-                shipperContribURL,
-                supplyChainContribURL
-        };
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
deleted file mode 100644
index b123951ef6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ /dev/null
@@ -1,381 +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.test.contribution;

-

-import java.io.File;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.Method;

-import java.net.URL;

-import java.net.URLClassLoader;

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-

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

-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.osoa.sca.ServiceReference;

-

-/*

- * 

- * Contribution ClassLoading integration tests

- */

-

-//FIXME This test case needs some serious rework!

-// First it is very dependent on the names of the Tuscany runtime JARs

-// and this is going to be difficult to maintain

-// Second its usage of reflection requires the Tuscany implementation classes

-// to be made public and this breaks isolation between modules.

-public class TuscanyClassloadingTestCaseFIXME {

-

-    //	private static final int SCA_API = 1;

-    //	private static final int TUSCANY_CORE_SPI = 2;

-    //	private static final int TUSCANY_RUNTIME = 3;

-    //	private static final int TUSCANY_EXTENSIONS = 4;

-    //	private static final int TUSCANY_DEPENDENCIES = 0;

-

-    private static final String[] scaApiJars = {"sca-api"};

-    private static final String[] tuscanyCoreSpiJars =

-        {"core-spi", "interface", "interface-java", "interface-wsdl", "assembly", "policy", "databinding",

-         "contribution", "definitions"};

-    private static final String[] tuscanyRuntimeJars =

-        {

-

-        "binding-sca-xml", "binding-sca", "assembly-java-dsl", "assembly-xml", "assembly-xsd", "contribution-impl",

-         "contribution-java", "contribution-namespace", "core-databinding", "core-spring", "core", "definitions-xml",

-         "domain-api", "domain-impl", "domain", "extension-helper", "host-embedded", "interface-java-xml",

-         "interface-wsdl-xml", "java2wsdl", "node-api", "node-impl", "node", "osgi-runtime", "policy-logging",

-         "policy-security", "policy-transaction", "policy-xml", "wsdl2java"};

-    private static final String[] tuscanyExtensionJars =

-        {"binding-dwr", "binding-ejb", "binding-feed", "binding-http", "binding-jms", "binding-jsonrpc",

-         "binding-notification", "binding-rmi", "binding-sca-axis2", "binding-ws-axis2", "binding-ws-xml",

-         "binding-ws", "databinding-axiom", "databinding-fastinfoset", "databinding-jaxb", "databinding-json",

-         "databinding-saxon", "databinding-sdo-axiom", "databinding-sdo", "databinding-xmlbeans", "host-http",

-         "host-jetty", "host-rmi", "host-tomcat", "host-webapp", "implementation-das.jar", "implementation-data.jar",

-         "implementation-java-runtime", "implementation-java-xml", "implementation-java",

-         "implementation-node-runtime", "implementation-node-xml", "implementation-node",

-         "implementation-notification", "implementation-osgi", "implementation-resource", "implementation-script",

-         "implementation-spring", "implementation-xquery", "contribution-osgi"};

-

-    private Class<?> embeddedDomainClass;

-    Object domain;

-

-    @Before

-    public void setUp() throws Exception {

-

-        embeddedDomainClass = getEmbeddedDomainClass();

-

-        Constructor c = embeddedDomainClass.getConstructor(ClassLoader.class, String.class);

-        // Create an embedded domain

-        domain = c.newInstance(embeddedDomainClass.getClassLoader(), "http://localhost");

-

-        // Start the domain

-        invokeNoArgsMethod(domain, "start");

-

-    }

-

-    @After

-    public void tearDown() throws Exception {

-

-        // Stop the domain

-        invokeNoArgsMethod(domain, "stop");

-

-    }

-

-    /**

-     * Create a ClassLoader hierarchy for Tuscany runtime

-     *     Dependencies <- SCA-API <- Core-SPI+ Runtime <- Extensions

-     * Load the embedded SCA domain class using the runtime ClassLoader

-     * 

-     * @return embedded SCA domain class

-     * @throws Exception

-     */

-    private Class<?> getEmbeddedDomainClass() throws Exception {

-

-        URL[] scaApiUrls;

-        URL[] runtimeUrls;

-        URL[] extensionUrls;

-        URL[] dependencyUrls;

-

-        // When the test is run under Eclipse, the ClassLoader for the test is

-        // sun.misc.Launcher$AppClassLoader. The first code path is taken.

-        // When the test is run under Maven, the ClassLoader for the test is

-        // org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass

-        // of URLClassLoader. The second code path is taken.

-        if (!(this.getClass().getClassLoader() instanceof URLClassLoader)) {

-            String classPath = System.getProperty("java.class.path");

-            String[] classPathEntries = classPath.split(System.getProperty("path.separator"));

-            HashSet<String> dependentJars = new HashSet<String>();

-            for (int i = 0; i < classPathEntries.length; i++) {

-                dependentJars.add(classPathEntries[i]);

-            }

-

-            scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars);

-            runtimeUrls =

-                getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars);

-            extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars);

-            dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars);

-        } else {

-            HashSet<URL> dependentJars = new HashSet<URL>();

-            URL[] classPathEntries = ((URLClassLoader)this.getClass().getClassLoader()).getURLs();

-            for (int i = 0; i < classPathEntries.length; i++) {

-                dependentJars.add(classPathEntries[i]);

-            }

-            scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars);

-            runtimeUrls =

-                getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars);

-            extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars);

-            dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars);

-

-        }

-

-        boolean useSingleClassLoader =

-            (scaApiUrls == null || scaApiUrls.length == 0) || (runtimeUrls == null || runtimeUrls.length == 0)

-                || (extensionUrls == null || extensionUrls.length == 0)

-                || (dependencyUrls == null || dependencyUrls.length == 0);

-

-        if (useSingleClassLoader) {

-            return EmbeddedSCADomain.class;

-        } else {

-

-            ClassLoader dependencyLoader = new URLClassLoader(dependencyUrls, null);

-            ClassLoader scaApiLoader = new URLClassLoader(scaApiUrls, dependencyLoader);

-            ClassLoader runtimeClassLoader = new URLClassLoader(runtimeUrls, scaApiLoader);

-            ClassLoader extensionClassLoader = new URLClassLoader(extensionUrls, runtimeClassLoader);

-

-            Class<?> serviceDiscoveryClass = runtimeClassLoader.loadClass(ServiceDiscovery.class.getName());

-            Method getInstanceMethod = serviceDiscoveryClass.getMethod("getInstance");

-            Object serviceDiscoveryObj = getInstanceMethod.invoke(null);

-            Method registerClassLoaderMethod =

-                serviceDiscoveryClass.getMethod("registerClassLoader", ClassLoader.class);

-            registerClassLoaderMethod.invoke(serviceDiscoveryObj, extensionClassLoader);

-

-            Thread.currentThread().setContextClassLoader(extensionClassLoader);

-

-            return runtimeClassLoader.loadClass(EmbeddedSCADomain.class.getName());

-

-        }

-

-    }

-

-    /**

-     * From the list of entries in the test ClassLoader, match

-     * Tuscany jars corresponding to a ClassLoader, and return the list

-     * of matching entries as URLs.

-     * This method is used when the test is run under eclipse, using CLASSPATH

-     * based application ClassLoader.

-     * 

-     * @param classPathEntries List of entries on CLASSPATH

-     * @param dependentJars Complete set of jars, remove jars corresponding to this

-     *                      ClassLoader from the set.

-     * @param jars List of Tuscany jars corresponding to this ClassLoader

-     * @return Matching URLs for the ClassLoader 

-     * @throws IOException

-     */

-    private URL[] getTuscanyClassLoaderURLs(String[] classPathEntries, HashSet<String> dependentJars, String[]... jars)

-        throws IOException {

-

-        String pathSeparator = System.getProperty("file.separator");

-        HashSet<String> classPathEntrySet;

-

-        if (jars.length == 0)

-            classPathEntrySet = dependentJars;

-        else {

-            classPathEntrySet = new HashSet<String>();

-

-            for (int i = 0; i < classPathEntries.length; i++) {

-

-                String classPathEntry = classPathEntries[i];

-                for (int j = 0; j < jars.length; j++) {

-                    String[] jarList = jars[j];

-                    if (jarList != null) {

-                        for (int k = 0; k < jarList.length; k++) {

-                            String jarName = "tuscany-" + jarList[k];

-                            String alternateJarName = "modules" + pathSeparator + jarList[k];

-                            if (classPathEntry.indexOf(jarName) >= 0 || classPathEntry.indexOf(alternateJarName) >= 0) {

-                                classPathEntrySet.add(classPathEntry);

-                                dependentJars.remove(classPathEntry);

-                            }

-                        }

-                    }

-                }

-            }

-

-        }

-        ArrayList<URL> urls = new ArrayList<URL>();

-

-        for (String fileName : classPathEntrySet) {

-            File file = new File((String)fileName);

-            if (!file.exists()) {

-                throw new FileNotFoundException(fileName);

-

-            } else {

-                urls.add(file.toURL());

-

-            }

-        }

-

-        return (URL[])urls.toArray(new URL[urls.size()]);

-    }

-

-    /**

-     * From the list of URLs of the test ClassLoader, match

-     * Tuscany jars corresponding to a ClassLoader, and return the matching URLs

-     * This method is used when the test is run under Maven. The test ClassLoader is

-     * org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass

-     * of URLClassLoader

-     * 

-     * @param classPathEntries List of URLs from the test ClassLoader

-     * @param dependentJars Complete set of jars, remove jars corresponding to this

-     *                      ClassLoader from the set.

-     * @param jars List of Tuscany jars corresponding to this ClassLoader

-     * @return Matching URLs for the ClassLoader 

-     * @throws IOException

-     */

-    private URL[] getTuscanyClassLoaderURLs(URL[] classPathEntries, HashSet<URL> dependentJars, String[]... jars)

-        throws IOException {

-

-        String pathSeparator = System.getProperty("file.separator");

-        HashSet<URL> classPathEntrySet;

-

-        if (jars.length == 0)

-            classPathEntrySet = dependentJars;

-        else {

-            classPathEntrySet = new HashSet<URL>();

-

-            for (int i = 0; i < classPathEntries.length; i++) {

-

-                URL classPathEntry = classPathEntries[i];

-                String classPathEntryStr = classPathEntry.getPath();

-                for (int j = 0; j < jars.length; j++) {

-                    String[] jarList = jars[j];

-                    if (jarList != null) {

-                        for (int k = 0; k < jarList.length; k++) {

-                            String jarName = "tuscany-" + jarList[k];

-                            String alternateJarName = "modules" + pathSeparator + jarList[k];

-                            if (classPathEntryStr.indexOf(jarName) >= 0 || classPathEntryStr.indexOf(alternateJarName) >= 0) {

-                                classPathEntrySet.add(classPathEntry);

-                                dependentJars.remove(classPathEntry);

-                            }

-                        }

-                    }

-                }

-            }

-

-        }

-        return (URL[])classPathEntrySet.toArray(new URL[classPathEntrySet.size()]);

-    }

-

-    private Object invokeNoArgsMethod(Object obj, String methodName) throws Exception {

-

-        return obj.getClass().getMethod(methodName).invoke(obj);

-    }

-

-    private Object invokeOneArgMethod(Object obj, String methodName, Class argType, Object arg) throws Exception {

-

-        return obj.getClass().getMethod(methodName, argType).invoke(obj, arg);

-    }

-

-    /**

-     * 

-     * Load Tuscany runtime using multiple ClassLoaders, and run supplychain

-     * test. 

-     * 

-     * @throws Exception

-     */

-    @SuppressWarnings("unchecked")

-    @Test

-    public void test() throws Exception {

-

-        ClassLoader runtimeClassloader = embeddedDomainClass.getClassLoader();

-

-        if (runtimeClassloader == this.getClass().getClassLoader()) {

-            System.out.println("Runtime and test loaded using the same classloader " + runtimeClassloader);

-        } else {

-            System.out

-                .println("Running test using separate Tuscany classloaders, runtime classloader=" + runtimeClassloader);

-            ClassLoader apiClassLoader =

-                runtimeClassloader.loadClass(ServiceReference.class.getName()).getClassLoader();

-            Assert.assertTrue(apiClassLoader != runtimeClassloader);

-

-            try {

-                runtimeClassloader.loadClass("org.apache.tuscany.sca.implementation.java.JavaImplementation");

-                Assert.fail("Loaded extension class incorrectly from runtimeClassLoader");

-            } catch (ClassNotFoundException e) {

-            }

-

-        }

-

-        // Contribute supplychain (as single contribution)

-        Object contributionService = invokeNoArgsMethod(domain, "getContributionService");

-        Method contributeMethod =

-            contributionService.getClass().getMethod("contribute", String.class, URL.class, boolean.class);

-

-        String folderName = "../contribution-classes/target/classes";

-        String supplychainJarName = "CompleteSupplyChain";

-        URL supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURL();

-        Object contribution = contributeMethod.invoke(contributionService, "SupplyChain", supplyChainContribURL, true);

-

-        Object composite = ((List)invokeNoArgsMethod(contribution, "getDeployables")).get(0);

-        Object domainComposite = invokeNoArgsMethod(domain, "getDomainComposite");

-        List includes = (List)invokeNoArgsMethod(domainComposite, "getIncludes");

-        includes.add(composite);

-        //Object compositeBuilder = invokeNoArgsMethod(domain, "getCompositeBuilder");

-        Object compositeActivator = invokeNoArgsMethod(domain, "getCompositeActivator");

-

-        Class compositeClass = embeddedDomainClass.getClassLoader().loadClass(Composite.class.getName());

-        invokeOneArgMethod(domain, "buildComposite", compositeClass, composite);

-        invokeOneArgMethod(compositeActivator, "activate", compositeClass, composite);

-        invokeOneArgMethod(compositeActivator, "start", compositeClass, composite);

-

-        // Get customer service 

-        Method getClassLoaderMethod = contribution.getClass().getMethod("getClassLoader");

-        ClassLoader classLoader = (ClassLoader)getClassLoaderMethod.invoke(contribution);

-

-        Class customerClass = classLoader.loadClass("supplychain.customer.Customer");

-        Method getServiceMethod = embeddedDomainClass.getMethod("getService", Class.class, String.class);

-        Object customer = getServiceMethod.invoke(domain, customerClass, "CustomerComponent");

-

-        // Invoke purchaseGoods

-        Method m = customerClass.getMethod("purchaseGoods");

-        m.invoke(customer);

-

-        m = customerClass.getMethod("outstandingOrderCount");

-

-        int retries = 10;

-        int outstandingCount = 1;

-        while (retries-- > 0) {

-

-            outstandingCount = (int)(Integer)m.invoke(customer);

-            if (outstandingCount == 0)

-                break;

-            else

-                Thread.sleep(100);

-        }

-        Assert.assertEquals(0, outstandingCount);

-

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-classloader/pom.xml
deleted file mode 100644
index b135705dd7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-classloader/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-classloader</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany Contribution ClassLoader Integration Tests</name>
-
-    <modules>
-        <module>contribution-classes</module>
-        <module>contribution-test</module>
-    </modules>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/pom.xml
deleted file mode 100644
index 755338c833..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-export-composite</artifactId>

-    <name>Apache Tuscany SCA Contribution Export Integration Tests</name>

-

-<dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
deleted file mode 100644
index e65422136f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ /dev/null
@@ -1,30 +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 hello;

-

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

-

-/**

- * This is the business interface of the Hello service.

- */

-@Remotable

-public interface Hello {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
deleted file mode 100644
index 5369c18497..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ /dev/null
@@ -1,33 +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 hello;

-

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

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(Hello.class)

-public class HelloImpl implements Hello {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 3c14560a56..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://hello"

-              xmlns:hello="http://hello">

-   	<deployable composite="hello:hello"/>

-   	<export namespace="http://hello"/>

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
deleted file mode 100644
index 636b7111d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ /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.    

--->

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

-	targetNamespace="http://hello"

-	xmlns:hello="http://hello"

-    name="hello">

-

-	<service name="HelloService" promote="HelloServiceComponent"/>

-	

-    <component name="HelloServiceComponent">

-        <implementation.java class="hello.HelloImpl" />

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
deleted file mode 100644
index 72b77564d2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ /dev/null
@@ -1,91 +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.test.contribution;

-

-import hello.Hello;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

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

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        // Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        URL helloURL = getContributionURL(Hello.class);

-        

-        // File helloContrib = new File("./target/classes/");

-        // URL helloURL = helloContrib.toURL();

-        Contribution consumerContribution =

-            contributionService.contribute("http://import-export/hello", helloURL, false);

-        Composite consumerComposite = consumerContribution.getDeployables().get(0);

-        domain.getDomainComposite().getIncludes().add(consumerComposite);

-        domain.buildComposite(consumerComposite);

-

-        // Start Components from my composite

-        domain.getCompositeActivator().activate(consumerComposite);

-        domain.getCompositeActivator().start(consumerComposite);

-    }

-

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testHello() throws IOException {

-        Hello hello = domain.getService(Hello.class, "HelloServiceComponent");

-        assertNotNull(hello);

-        assertEquals(hello.getGreetings("lresende"), "Hello lresende");

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/pom.xml
deleted file mode 100644
index 250a913bff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-export-java</artifactId>

-    <name>Apache Tuscany SCA Contribution Java Export Integration Tests</name>

-

-<dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;

-

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

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index dc33dfa560..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   	<export.java package="helloworld"/>

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
deleted file mode 100644
index 5a14b41650..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="HelloWorldService">
-        <interface.java interface="helloworld.HelloWorldService" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/pom.xml
deleted file mode 100644
index ebc1f392ab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/pom.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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-export-resource</artifactId>
-    <name>Apache Tuscany SCA Contribution Resource Export Integration Tests</name>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f11eacb416..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://store"
-              xmlns:helloworld="http://store">
-   	<export.resource uri="ufservices/store.html"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
deleted file mode 100644
index 1ff281373a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ /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.    
--->
-<html>
-<head>
-<title>Store</TITLE>
-</head>
-
-<body>
-<h1>Sample Store Page</h1>
-</body>
-</html>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/pom.xml
deleted file mode 100644
index eee5c288b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/pom.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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-export-wsdl</artifactId>

-    <name>Apache Tuscany SCA Contribution WSDL Export Integration Tests</name>

-

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b7394ec14b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   	<export namespace="http://helloworld"/>

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ /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.    

--->

-

-<wsdl:definitions targetNamespace="http://helloworld" 

-                  xmlns:tns="http://helloworld" 

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 

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

-	          name="helloworld">

-

-    <wsdl:types>

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

-                xmlns:tns2="http://helloworld2" 

-                targetNamespace="http://helloworld" 

-                elementFormDefault="qualified">

-                

-  	        <xsd:import namespace="http://helloworld2" schemaLocation="helloworld.xsd" />            

-  	        

-  	       	<element name="getGreetings" type="tns2:getGreetingsType"/>

-		    <element name="getGreetingsResponse" type="tns2:getGreetingsResponseType"/>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ /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.

--->

-<schema targetNamespace="http://helloworld2" 

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

-	    xmlns:ns="http://helloworld2">

-	

-	<complexType name="getGreetingsType">

-		<sequence>

-			<element name="name" type="string"/>

-		</sequence>

-	</complexType>

-

-	<complexType name="getGreetingsResponseType">

-		<sequence>

-			<element name="getGreetingsReturn" type="string"/>

-		</sequence>

-	</complexType>

-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/pom.xml
deleted file mode 100644
index ec0a8061ef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/pom.xml
+++ /dev/null
@@ -1,73 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-import-composite</artifactId>

-    <name>Apache Tuscany SCA Contribution Import Integration Tests</name>

-

-<dependencies>

-        <dependency>

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

-            <artifactId>itest-contribution-export-composite</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 966f56d7d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.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 helloworld;

-

-import hello.Hello;

-

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

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

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-    @Reference

-    protected Hello helloServiceRef;

-

-    public String getGreetings(String name) {

-        return helloServiceRef.getGreetings(name);

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;

-

-import java.io.IOException;

-

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

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

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

-

-        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("HelloWorld server stopped");

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;

-

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

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 9f3f5be452..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld"

-              xmlns:hello="http://hello">

-   <deployable composite="helloworld:helloworldws"/>

-   <import namespace="http://hello"/>

-   <!-- import namespace="http://hello" location="http://import-export/contrib-composite"/ -->

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ /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.    

--->

-

-<wsdl:definitions targetNamespace="http://helloworld" 

-                  xmlns:tns="http://helloworld" 

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 

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

-	          name="helloworld">

-

-    <wsdl:types>

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

-                xmlns:tns2="http://helloworld2" 

-                targetNamespace="http://helloworld" 

-                elementFormDefault="qualified">

-                

-  	        <xsd:import namespace="http://helloworld2" schemaLocation="helloworld.xsd" />            

-  	        

-  	       	<element name="getGreetings" type="tns2:getGreetingsType"/>

-		    <element name="getGreetingsResponse" type="tns2:getGreetingsResponseType"/>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ /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.

--->

-<schema targetNamespace="http://helloworld2" 

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

-	    xmlns:ns="http://helloworld2">

-	

-	<complexType name="getGreetingsType">

-		<sequence>

-			<element name="name" type="string"/>

-		</sequence>

-	</complexType>

-

-	<complexType name="getGreetingsResponseType">

-		<sequence>

-			<element name="getGreetingsReturn" type="string"/>

-		</sequence>

-	</complexType>

-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
deleted file mode 100644
index e2f852ff7e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.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://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://helloworld"

-	xmlns:helloworld="http://helloworld"

-	xmlns:hello="http://hello"

-    name="helloworldws">

-

-    <component name="SourceHelloServiceComponent">

-       <implementation.composite name="hello:hello"/>

-    </component>

-

-    <component name="HelloWorldServiceComponent">

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-	        <binding.ws uri="http://localhost:8085/HelloWorldService"/>

-	    </service>

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

-        <reference name="helloServiceRef" target="SourceHelloServiceComponent/HelloService"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 1176a89143..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,126 +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.test.contribution;

-

-import hello.Hello;

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.Socket;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

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

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution helloWorldContribution;

-    private Contribution compositeContribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        // File compositeContribLocation = new File("../export-composite/target/classes");

-        // URL compositeContribURL = compositeContribLocation.toURL();

-        URL compositeContribURL = getContributionURL(Hello.class);

-        compositeContribution =

-            contributionService.contribute("http://import-export/export-composite", compositeContribURL, false);

-        for (Composite deployable : compositeContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-//        File helloWorldContribLocation = new File("./target/classes/");

-//        URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldService.class);

-        helloWorldContribution =

-            contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-    

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testPing() throws IOException {

-        new Socket("127.0.0.1", 8085);

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-composite");

-

-        //Stop Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/pom.xml
deleted file mode 100644
index d9e6ad9e64..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/pom.xml
+++ /dev/null
@@ -1,73 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-import-java</artifactId>

-    <name>Apache Tuscany SCA Contribution Java Import Java Integration Tests</name>

-

-<dependencies>

-        <dependency>

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

-            <artifactId>itest-contribution-export-java</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

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

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 224e2c4d79..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   <deployable composite="helloworld:helloworldws"/>

-   <import.java package="helloworld"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
deleted file mode 100644
index 9b650e4acc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/main/resources/helloworldws.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://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://helloworld"

-	xmlns:helloworld="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

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

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 431988cc04..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,127 +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.test.contribution;

-

-import helloworld.HelloWorldImpl;

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

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

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution helloWorldContribution;

-    private Contribution javaContribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-        

-        //File javaContribLocation = new File("../export-java/target/classes");

-        //URL javaContribURL = javaContribLocation.toURL();

-        URL javaContribURL = getContributionURL(HelloWorldService.class);

-        javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false);

-        for (Composite deployable : javaContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        //File helloWorldContribLocation = new File("./target/classes/");

-        //URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class);

-        helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-    

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testPing() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-        assertEquals("Hello test", helloWorldService.getGreetings("test"));

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-java");

-

-        // Stop Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/pom.xml
deleted file mode 100644
index f04a0825fb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/pom.xml
+++ /dev/null
@@ -1,95 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-import-resource</artifactId>
-    <name>Apache Tuscany SCA Contribution Resource Import Java Integration Tests</name>
-
-<dependencies>
-	
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-contribution-export-resource</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</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-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac6d7becb3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://store"
-              xmlns:store="http://store">
-   <deployable composite="store:store"/>
-   <import.resource uri="ufservices/store.html"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/main/resources/store.composite
deleted file mode 100644
index bb5a7b764f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://store"
-	xmlns:helloworld="http://store"
-    name="store">
-
-    <component name="store">
-        <tuscany:implementation.resource location="ufservices/store.html"/>
-        <service name="Resource">
-        	<tuscany:binding.http uri="http://127.0.0.1:8085"/> 
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
deleted file mode 100644
index 1b7542b7d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ /dev/null
@@ -1,129 +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.test.contribution;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class StoreTestCase extends TestCase {
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution storeContribution;
-    private Contribution resourceContribution;
-
-    @Override
-    protected void setUp() throws Exception {
-        //Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        URL javaContribURL = getContributionURL(cl, "ufservices/store.html");
-        resourceContribution = contributionService.contribute("http://import-export/export-resource", javaContribURL, false);
-        for (Composite deployable : resourceContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        URL storeContributionURL = getContributionURL(cl, "store.composite");
-
-        storeContribution =
-            contributionService.contribute("http://import-export/store", storeContributionURL, false);
-        for (Composite deployable : storeContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        // Start Components from my composite
-        for (Composite deployable : storeContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-    }
-
-    public void testPing() throws IOException {
-    	new Socket("127.0.0.1", 8085);
-    }
-
-
-    @Override
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://import-export/store");
-        contributionService.remove("http://import-export/export-resource");
-
-        // Stop Components from my composite
-        for (Composite deployable : storeContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-
-        domain.stop();
-
-        domain.close();
-    }
-
-    
-    /**
-     * Utility methods
-     */
-    
-
-    private URL getContributionURL(ClassLoader cl, Class<?> cls) throws MalformedURLException {
-        String flag = "/" + cls.getName().replace('.', '/') + ".class";
-        URL url = cl.getResource(flag);
-        String root = url.toExternalForm();
-        root = root.substring(0, root.length() - flag.length() + 1);
-        if (root.startsWith("jar:") && root.endsWith("!/")) {
-            root = root.substring(4, root.length() - 2);
-        }
-        url = new URL(root);
-        return url;
-    }
-    
-    private URL getContributionURL(ClassLoader cl, String uri) throws MalformedURLException {
-        URL url = cl.getResource(uri);
-        String root = url.toExternalForm();
-        root = root.substring(0, root.length() - uri.length());
-        if (root.startsWith("jar:") && root.endsWith("!/")) {
-            root = root.substring(4, root.length() - 2);
-        }
-        url = new URL(root);
-        return url;
-    }        
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/pom.xml
deleted file mode 100644
index b71624734f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/pom.xml
+++ /dev/null
@@ -1,73 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-import-wsdl</artifactId>

-    <name>Apache Tuscany SCA Contribution WSDL Import Integration Tests</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>itest-contribution-export-wsdl</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

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

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;

-

-import java.io.IOException;

-

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

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

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

-

-        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("HelloWorld server stopped");

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;

-

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

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d46fe0b57c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   <deployable composite="helloworld:helloworldws"/>

-   <import namespace="http://helloworld" location="http://import-export/export-wsdl"/>

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
deleted file mode 100644
index 5008a2ea5b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ /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.    

--->

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

-	targetNamespace="http://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-	        <binding.ws uri="http://localhost:8085/HelloWorldService"/>

-	    </service>

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

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 5c40606e50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,137 +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.test.contribution;

-

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.Socket;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

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

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution wsdlContribution;

-    private Contribution consumerContribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        //        File wsdlContribLocation = new File("../export-wsdl/target/classes");

-        //        URL wsdlContribURL = wsdlContribLocation.toURL();

-        URL wsdlContribURL = getContributionURL(getClass().getClassLoader(), "helloworld.wsdl");

-        wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false);

-        for (Composite deployable : wsdlContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        //        File helloWorldContribLocation = new File("./target/classes/");

-        //        URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldService.class);

-        consumerContribution =

-            contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : consumerContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : consumerContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-

-    public void testPing() throws IOException {

-        new Socket("127.0.0.1", 8085);

-    }

-

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    private URL getContributionURL(ClassLoader cl, String flag) throws MalformedURLException {

-        URL url = cl.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length());

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        // System.out.println(url);

-        return url;

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-wsdl");

-

-        // Stop Components from my composite

-        for (Composite deployable : consumerContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-import-export/pom.xml
deleted file mode 100644
index d485679f28..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-import-export/pom.xml
+++ /dev/null
@@ -1,56 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution-import-export</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Contribution Import/Export Integration Tests</name>

-

-    <modules>

-        <module>export-composite</module>

-        <module>export-java</module>

-        <module>export-resource</module>

-        <module>export-wsdl</module>

-        <module>import-composite</module>

-        <module>import-java</module>

-        <module>import-resource</module>

-        <module>import-wsdl</module>

-    </modules>

-    

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/pom.xml
deleted file mode 100644
index 1280a7647e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-multiple</artifactId>
-    <name>Apache Tuscany SCA Multiple Contribution Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/hello/Hello.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/hello/Hello.java
deleted file mode 100644
index 7e574a7db3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/hello/Hello.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 hello;
-
-/**
- * This is the business interface of the Hello service.
- */
-public interface Hello {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
deleted file mode 100644
index ff9f6e75f3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ /dev/null
@@ -1,33 +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 hello;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(Hello.class)
-public class HelloImpl implements Hello {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c062afaed0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.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 helloworld;
-
-import hello.Hello;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-    @Reference
-    protected Hello helloServiceRef;
-
-    public String getGreetings(String name) {
-        return helloServiceRef.getGreetings(name);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 5251fc0a45..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/helloworld/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 helloworld;
-
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
deleted file mode 100644
index ec5123eb2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ /dev/null
@@ -1,121 +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 test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contributions scenario
- * 
- * FIXME This test case causes a StackOverflowException instead of
- * reporting an error when a composite is not found, as there's a
- * dependency cycle in the test contributions and the model resolvers
- * do not handle import cycles properly.
- * 
- */
-public class ContributionCycleTestCaseFIXME extends TestCase {
-
-    private String helloContribution_dir = "target/test-classes/contribution-cycle-export";
-    private String helloWorldContribution_one_dir = "target/test-classes/contribution-cycle-import";
-
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution helloContribution;
-    private Contribution helloWorldContribution_one;
-
-    protected void setUp() throws Exception {
-        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
-        URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-
-        // Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        // Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        helloContribution =
-            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-        
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-        helloWorldContribution_one =
-            contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-    }
-
-    public void testServiceCall() throws IOException {
-        HelloWorldService helloWorldService_one =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
-        assertNotNull(helloWorldService_one);
-
-        assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
-    }
-
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://contribution-multiple/helloworld");
-        contributionService.remove("http://contribution-multiple/helloworld_one");
-
-        // Stop Components from my composite
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        // domain.stop();
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
deleted file mode 100644
index 133c98f357..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.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 test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contribution scenario
- * Contributed by TUSCANY-1718
- */
-public class ContributionMultipleTestCaseFIXME extends TestCase {
-
-    private String helloContribution_dir = "target/test-classes/contribution-export";
-    private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
-    private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
-
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution helloContribution;
-    private Contribution helloWorldContribution_one;
-    private Contribution helloWorldContribution_two;
-
-    protected void setUp() throws Exception {
-        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
-        URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-        URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
-
-        // Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        // Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        helloContribution =
-            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
-        helloWorldContribution_one =
-            contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-
-        helloWorldContribution_two =
-            contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
-
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-        }
-                
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-        }
-
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-        }
-
-        domain.buildComposite(domain.getDomainComposite());
-        domain.getCompositeActivator().activate(domain.getDomainComposite());
-        domain.getCompositeActivator().start(domain.getDomainComposite());
-
-    }
-
-    public void testServiceCall() throws IOException {
-        HelloWorldService helloWorldService_one =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
-        assertNotNull(helloWorldService_one);
-
-        assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
-        HelloWorldService helloWorldService_two =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
-        assertNotNull(helloWorldService_two);
-
-        assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
-        
-    }
-
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://contribution-multiple/helloworld");
-        contributionService.remove("http://contribution-multiple/helloworld_one");
-        contributionService.remove("http://contribution-multiple/helloworld_two");
-
-        // Stop Components from my composite
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }        
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        // domain.stop();
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
deleted file mode 100644
index 790b6fed98..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ /dev/null
@@ -1,145 +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 test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contribution scenario
- * Contributed by TUSCANY-1756
- */
-public class ContributionTestCase extends TestCase {
-
-    private String helloContribution_dir = "target/test-classes/contribution-export";
-    //private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
-    private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
-
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution helloContribution;
-    //private Contribution helloWorldContribution_one;
-    private Contribution helloWorldContribution_two;
-
-    protected void setUp() throws Exception {
-        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
-        //URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-        URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
-
-        // Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        // Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        helloContribution =
-            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
-        //helloWorldContribution_one =
-         //   contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-
-        helloWorldContribution_two =
-            contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
-
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-        //    domain.getDomainComposite().getIncludes().add(deployable);
-        //    domain.buildComposite(deployable);
-        //}
-
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-        
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-        //    domain.getCompositeActivator().activate(deployable);
-        //    domain.getCompositeActivator().start(deployable);
-        //}
-
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }        
-
-    }
-
-    public void testServiceCall() throws IOException {
-        //HelloWorldService helloWorldService_one =
-            //domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
-        //assertNotNull(helloWorldService_one);
-
-        //assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
-        HelloWorldService helloWorldService_two =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
-        assertNotNull(helloWorldService_two);
-
-        assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
-        
-    }
-
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://contribution-multiple/helloworld");
-        //contributionService.remove("http://contribution-multiple/helloworld_one");
-        contributionService.remove("http://contribution-multiple/helloworld_two");
-
-        // Stop Components from my composite
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }        
-        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-        //    domain.getCompositeActivator().stop(deployable);
-        //    domain.getCompositeActivator().deactivate(deployable);
-        //}
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        // domain.stop();
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b76783c3d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://hello"
-              xmlns:hello="http://hello">
-   	<deployable composite="hello:hello"/>
-   	<export namespace="http://hello"/>
-   	<import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://hello"
-	xmlns:hello="http://hello"
-    name="hello">
-
-	<service name="HelloService" promote="HelloServiceComponent"/>
-	
-    <component name="HelloServiceComponent">
-        <implementation.java class="hello.HelloImpl" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld"
-              xmlns:hello="http://hello">
-   <deployable composite="helloworld:helloworld_one"/>
-   <import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
deleted file mode 100644
index 7a8003577e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:hello="http://hello"
-    name="helloworld_one">
-
-    <component name="SourceHelloServiceComponent_one">
-       <implementation.composite name="hello:helloexport"/>
-    </component>
-
-    <component name="HelloWorldServiceComponent_one">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <reference name="helloServiceRef" target="SourceHelloServiceComponent_one/HelloService"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
deleted file mode 100644
index bea6f39932..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-export/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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://hello"
-              xmlns:hello="http://hello">
-   	<deployable composite="hello:hello"/>
-   	<export namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://hello"
-	xmlns:hello="http://hello"
-    name="hello">
-
-	<service name="HelloService" promote="HelloServiceComponent"/>
-	
-    <component name="HelloServiceComponent">
-        <implementation.java class="hello.HelloImpl" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld"
-              xmlns:hello="http://hello">
-   <deployable composite="helloworld:helloworld_one"/>
-   <import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
deleted file mode 100644
index 45cb504ea4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:hello="http://hello"
-    name="helloworld_one">
-
-    <component name="SourceHelloServiceComponent_one">
-       <implementation.composite name="hello:hello"/>
-    </component>
-
-    <component name="HelloWorldServiceComponent_one">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <reference name="helloServiceRef" target="SourceHelloServiceComponent_one/HelloService"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
deleted file mode 100644
index cbabdcd4fc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld"
-              xmlns:hello="http://hello">
-   <deployable composite="helloworld:helloworld_two"/>
-   <import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
deleted file mode 100644
index 4c9225de34..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:hello="http://hello"
-    name="helloworld_two">
-
-    <component name="SourceHelloServiceComponent_two">
-       <implementation.composite name="hello:hello"/>
-    </component>
-
-    <component name="HelloWorldServiceComponent_two">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <reference name="helloServiceRef" target="SourceHelloServiceComponent_two/HelloService"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/pom.xml b/tags/java/sca/1.3-RC1a/itest/contribution/pom.xml
deleted file mode 100644
index cd216c4ee5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-contribution</artifactId>

-    <name>Apache Tuscany SCA Contribution Integration Tests</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/AddService.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4e72f92fda..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,32 +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 calculator;

-

-/**

- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this

- * interface. Implementation for these methods is provided in AddServiceImpl Class

- */

-public interface AddService {

-

-    /**

-     * This is an add method which takes 2 parameters of double type and returns the sum of two parameters

-     */

-    double add(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        return n1 + n2;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 40ca4d9b0f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,46 +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 calculator;

-

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

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

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

-

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

-        

-        CalculatorService calculatorService = domain.getService(CalculatorService.class,

-                                                                                "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        domain.close();

-

-    }

-

-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index f288af0174..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ /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.    

- */

-package calculator;

-

-/**

- * This is a Calculator service interface. All the methods which are to be accessed as a service are declared in this

- * interface but not the implementation of those methods.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ae4ed12b7b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;

-

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

-

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ad99418f5b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,32 +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 calculator;

-

-/**

- * This is an interface for Divide Service which has divide method declared which is implemented in DivideServiceImpl

- * class

- */

-public interface DivideService {

-

-    /**

-     * This is a divide method which takes 2 parameters of double type and returns the result of division

-     */

-    double divide(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 3987b0a54f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,33 +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 calculator;

-

-/**

- * This is an interface for Multiply Service which has multiply method declared which is implemented in

- * MultiplyServiceImpl class

- */

-public interface MultiplyService {

-

-    /**

-     * This is a multiply method which takes 2 parameters of double type and returns the result of multiplication of the

-     * two parameters

-     */

-    double multiply(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 25e0ed6ca7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,33 +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 calculator;

-

-/**

- * This is an interface for Subtract Service which has subtract method declared which is implemented in

- * SubtractServiceImpl class

- */

-

-public interface SubtractService {

-

-    /**

-     * This is a subtract method which takes 2 parameters of double type and returns the result of subtraction.

-     */

-    double subtract(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        return n1 - n2;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/ContributionTest.composite b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/ContributionTest.composite
deleted file mode 100644
index d814e439e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/ContributionTest.composite
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	   xmlns:foo="http://foo" 
-           name="ContributionTest">
-   
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/calculator/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/calculator/Calculator.composite
deleted file mode 100644
index 657a2f95d8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ /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.    

--->

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

-           name="Calculator">

-

-    <service name="CalculatorService" promote="CalculatorServiceComponent">

-        <interface.java interface="calculator.CalculatorService"/>

-    </service>

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent"></reference>

-        <reference name="subtractService" target="SubtractServiceComponent"></reference>

-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

-        <reference name="divideService" target="DivideServiceComponent"></reference>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/calculator/sca-contribution.xml
deleted file mode 100644
index e95796d83a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

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

-   <deployable composite="sample:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 97b2e5d6ed..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ /dev/null
@@ -1,218 +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.test.contribution;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.security.PrivilegedActionException;

-import java.security.PrivilegedExceptionAction;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import junit.framework.TestCase;

-

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

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

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.contribution.service.util.FileHelper;

-import org.apache.tuscany.sca.contribution.service.util.IOHelper;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * This is more intended to be a integration test then a unit test. *

- */

-public class ContributionServiceTestCase extends TestCase {

-    private static final String CONTRIBUTION_001_ID = "contribution001/";

-    private static final String CONTRIBUTION_002_ID = "contribution002/";

-    private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";

-    private static final String FOLDER_CONTRIBUTION = "target/classes/";

-

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private ContributionService contributionService;

-

-    /**

-     * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending

-     * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and

-     * to get a reference to the contribution service

-     */

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        //get a reference to the contribution service

-        contributionService = domain.getContributionService();

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime.

-     */

-    public void testContributeJAR() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        //URL contributionLocation = new URL("file:/D:/dev/Opensource/Apache/Tuscany/source/java/sca/samples/calculator/target/sample-calculator.jar");

-        String contributionId = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId, contributionLocation, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testStoreContributionPackageInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId, contributionLocation, true);

-

-        assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))

-            .exists());

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = contributionService.getContribution(contributionId);

-

-        File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));

-        assertTrue(contributionFile.exists());

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testStoreContributionStreamInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-

-        InputStream contributionStream = contributionLocation.openStream();

-        try {

-            contributionService.contribute(contributionId, contributionLocation, contributionStream);

-        } finally {

-            IOHelper.closeQuietly(contributionStream);

-        }

-

-        assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))

-            .exists());

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = contributionService.getContribution(contributionId);

-

-        File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));

-        assertTrue(contributionFile.exists());

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId1,contributionId2 with the value retrieved from the SCA

-     * runtime using contributionService.

-     */

-    public void testStoreDuplicatedContributionInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId1 = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId1, contributionLocation, true);

-        assertNotNull(contributionService.getContribution(contributionId1));

-        String contributionId2 = CONTRIBUTION_002_ID;

-        contributionService.contribute(contributionId2, contributionLocation, true);

-        assertNotNull(contributionService.getContribution(contributionId2));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testContributeFolder() throws Exception {

-        final File rootContributionFolder = new File(FOLDER_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        //first rename the sca-contribution metadata file 

-        //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml"); 

-        //File metadataDirectory = new File("target/classes/META-INF/"); 

-        //if (!metadataDirectory.exists()) {

-        //    FileHelper.forceMkdir(metadataDirectory); 

-        //}

-        //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);

-

-        // Requires permission to read user.dir property. Requires PropertyPermision in security policy.

-        URL contributionFolderURL;

-        try {

-            contributionFolderURL = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {

-                public URL run() throws IOException {

-                    return rootContributionFolder.toURL();

-                }

-            });

-        } catch (PrivilegedActionException e) {

-            throw (IOException)e.getException();

-        }        

-        contributionService.contribute(contributionId, contributionFolderURL, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId, artifactId with the value retrieved from the SCA runtime

-     * using contributionService.

-     */

-    public void testAddDeploymentComposites() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        Contribution contribution = contributionService.contribute(contributionId, contributionLocation, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-

-        String artifactId = "contributionComposite.composite";

-        Composite composite = (new DefaultAssemblyFactory()).createComposite();

-        composite.setName(new QName(null, "contributionComposite"));

-        composite.setURI("contributionComposite.composite");

-

-        contributionService.addDeploymentComposite(contribution, composite);

-

-        List deployables = contributionService.getContribution(contributionId).getDeployables();

-        Composite composite1 = (Composite)deployables.get(deployables.size() - 1);

-        assertEquals("contributionComposite", composite1.getName().toString());

-

-        Artifact artifact = null;

-        contribution = contributionService.getContribution(contributionId);

-        String id = artifactId.toString();

-        for (Artifact a : contribution.getArtifacts()) {

-            if (id.equals(a.getURI())) {

-                artifact = a;

-                break;

-            }

-        }

-        Composite composite2 = (Composite)artifact.getModel();

-        assertEquals("contributionComposite", composite2.getName().toString());

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.3-RC1a/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/contribution/src/test/resources/repository/sample-calculator.jar b/tags/java/sca/1.3-RC1a/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/conversations-ws/pom.xml
deleted file mode 100644
index cb4eff7c2b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/pom.xml
+++ /dev/null
@@ -1,60 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-conversations-ws</artifactId>

-    <name>Apache Tuscany SCA Conversations Over binding.ws Integration Tests</name>

-

-    <dependencies>

-

-        

-        <dependency>

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

-            <artifactId>tuscany-node2-impl</artifactId>

-            <version>1.3</version>

-        </dependency>        

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>         

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
deleted file mode 100644
index 9cd88620e3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ /dev/null
@@ -1,41 +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.itest.conversational;

-

-public class BusinessException extends Exception {

-

-    private String message;

-

-    public BusinessException() {

-        super();

-    }

-

-    public BusinessException(String message) {

-        super(message);

-        setMessage(message);

-    }

-

-    public String getMessage() {

-        return message;

-    }

-

-    public void setMessage(String message) {

-        this.message = message;

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index 53dadc3dc7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ /dev/null
@@ -1,29 +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.itest.conversational;

-

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

-

-@Conversational

-public interface ConversationIdService {

-

-    String getCIDField();

-    String getCIDSetter();

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index cb7a032e85..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +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.itest.conversational;

-

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

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

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

-

-

-/**

- * The callback interface used when testing conversational callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-public interface ConversationalCallback {

-	

-   // public void init();

-    

-   // public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws BusinessException;        

-    

-    @EndsConversation

-    public String endConversation();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 2532346349..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ /dev/null
@@ -1,50 +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.itest.conversational;

-

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

-

-/**

- * The client for the conversational itest. Is implemented by clients

- * offering both stateless and stateful callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Remotable

-public interface ConversationalClient { 

-	

-	public int runConversationFromInjectedReference();

-	public int runConversationFromInjectedReference2();

-	public int runConversationFromServiceReference();

-	public int runConversationWithUserDefinedConversationId();

-	public String runConversationCheckUserDefinedConversationId();	

-	public int runConversationCheckingScope();

-	public int runConversationWithCallback(); 

-	public int runConversationHavingPassedReference();

-	public String runConversationBusinessException();

-	public String runConversationBusinessExceptionCallback();

-	public int runConversationCallingEndedConversation();

-	public int runConversationCallingEndedConversationCallback();

-        public String runConversationCallingEndedConversationCheckConversationId(); 

-	public String runConversationCallingEndedConversationCallbackCheckConversationId();

-	public int runConversationAgeTimeout();

-	public int runConversationIdleTimeout();

-	public int runConversationPrincipleError();	

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.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 org.apache.tuscany.sca.itest.conversational;

-

-import org.osoa.sca.CallableReference;

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

-

-/**

- * The client that calls into an existing conversation by accepting

- * a reference to that conversation

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Remotable

-public interface ConversationalReferenceClient { 

-	

-    public void incrementCount(CallableReference<ConversationalService> conversationalService);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 1e36ce6917..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ /dev/null
@@ -1,58 +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.itest.conversational;

-

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

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

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

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

-

-

-/**

- * The service interface used when testing conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-@Callback(ConversationalCallback.class)

-public interface ConversationalService {

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    //public void businessException() throws BusinessException;        

-    

-    public void initializeCountCallback(int count);

-    

-    public void incrementCountCallback();

-    

-    public int retrieveCountCallback();

-    

-    //public void businessExceptionCallback() throws BusinessException;    

-    

-    @EndsConversation

-    public String endConversation();

-    

-    public String endConversationCallback();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index b4d3fe3d71..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.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.sca.itest.conversational;

-

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

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

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

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

-

-

-/**

- * The service interface used when testing conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-@Callback(NonConversationalCallback.class)

-public interface ConversationalServiceNonConversationalCallback {

-

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws BusinessException;        

-    

-    public void initializeCountCallback(int count);

-    

-    public void incrementCountCallback();

-    

-    public int retrieveCountCallback();

-    

-    public void businessExceptionCallback() throws BusinessException;    

-    

-    @EndsConversation

-    public String endConversation();

-    

-    public String endConversationCallback();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index ed3a01c10b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ /dev/null
@@ -1,42 +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.itest.conversational;

-

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

-

-

-/**

- * The callback interface used when testing conversational callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-public interface NonConversationalCallback {

-	   

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws BusinessException;        

-    

-    public String endConversation();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 1603916cca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.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.sca.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

-

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="1 seconds")

-public class ConversationAgeComponentImpl implements ConversationalService {

-

-    private int count;

-    

-    public void businessException() throws BusinessException {   

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {   

-    }      

-

-    public void destroy() {

-    }

-

-    public String endConversation() {

-        return null;

-    }

-

-    public String endConversationCallback() {

-        return null;

-    }

-

-    public void incrementCount() {

-    }

-

-    public void incrementCountCallback() {

-    }

-

-    public void init() {

-    }

-

-    public void initializeCount(int count) {

-        this.count = count;

-    }

-

-    public void initializeCountCallback(int count) {

-    }

-

-    public int retrieveCount() {

-        return count;

-    }

-

-    public int retrieveCountCallback() {

-        return 0;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index accc1eee27..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.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 org.apache.tuscany.sca.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationIdService;

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

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

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

-

-@Service(ConversationIdService.class)

-@Scope("CONVERSATION")

-public class ConversationIdComponentImpl implements ConversationIdService {

-

-    @ConversationID

-    public String cid;

-

-    private String setterCid;

-    

-    public String getCIDField() {

-        return cid;

-    }

-    public String getCIDSetter() {

-        return setterCid;

-    }

-    

-

-    @ConversationID

-    public void setCID(String cid) {

-        this.setterCid = cid;

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 90f6de86ac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.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.sca.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

-

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxIdleTime="1 seconds")

-public class ConversationMaxIdleComponentImpl implements ConversationalService {

-

-    private int count;

-

-    public void businessException() throws BusinessException {   

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {   

-    }    

-    

-    public void destroy() {

-    }

-

-    public String endConversation() {

-        return null;

-    }

-

-    public String endConversationCallback() {

-        return null;

-    }

-

-    public void incrementCount() {

-    }

-

-    public void incrementCountCallback() {

-    }

-

-    public void init() {

-    }

-

-    public void initializeCount(int count) {

-        this.count = count;

-    }

-

-    public void initializeCountCallback(int count) {

-    }

-

-    public int retrieveCount() {

-        return count;

-    }

-

-    public int retrieveCountCallback() {

-        return 0;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 3f7a90b3dc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,322 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

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

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

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

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {

-    

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-      

-    private int clientCount = 0;

-    private int callbackCount = 0;  

-    

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();        

-	

-    // From ConversationalClient

-	public int runConversationFromInjectedReference(){

-	    calls.append("runConversationFromInjectedReference,");	    

-	    conversationalService.initializeCount(1);

-	    conversationalService.incrementCount();

-	    clientCount = conversationalService.retrieveCount();

-	    conversationalService.endConversation();

-	    

-	    return clientCount;

-	}

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");

-               

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }	

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        

-        String clientConversationId = serviceReference.getConversationID().toString();

-        String serverConversationId = callableReference.endConversation();

-        

-        if (clientConversationId.equals("MyConversation2") &&

-            serverConversationId.equals("MyConversation2") ) {

-            return clientConversationId;

-        } else {

-            return "client = " + clientConversationId +

-                   "server = " + serverConversationId;

-        }  

-              

-    }      

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }    

-	public int runConversationWithCallback(){

-	    calls.append("runConversationWithCallback,");

-	    callbackCount = 2;

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        serviceReference.getConversation().end();

-        

-        return clientCount;

-    }

-    public String runConversationBusinessException(){

-        calls.append("runConversationbusinessException,");      

-        try {

-            conversationalService.initializeCount(1);

-//            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }

-    

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-//            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }   

-    

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }       

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    } 

-     

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,"); 

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount += count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index ab91498132..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,311 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

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

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

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

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {

-    

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-      

-    private int clientCount = 0;

-    private int callbackCount = 0;  

-    

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();        

-	

-    // From ConversationalClient

-	public int runConversationFromInjectedReference(){

-	    calls.append("runConversationFromInjectedReference,");	    

-	    conversationalService.initializeCount(1);

-	    conversationalService.incrementCount();

-	    clientCount = conversationalService.retrieveCount();

-	    conversationalService.endConversation();

-	    

-	    return clientCount;

-	}

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");

-               

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }	

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        return callableReference.endConversation();

-              

-    }      

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }    

-	public int runConversationWithCallback(){

-	    calls.append("runConversationWithCallback,");

-	    callbackCount = 2;

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }

-    public String runConversationBusinessException(){

-        calls.append("runConversationbusinessException,");      

-        try {

-            conversationalService.initializeCount(1);

-//            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }

-    

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-//            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }   

-    

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }     

-    

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }   

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    }  

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,"); 

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount += count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index e4f83656de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,318 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

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

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {

-   

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-    

-    private int clientCount = 0;

-    private int callbackCount = 0;

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();    

-	

-    // From ConversationalClient

-    public int runConversationFromInjectedReference(){

-        calls.append("runConversationFromInjectedReference,");

-        conversationalService.initializeCount(1);

-        conversationalService.incrementCount();

-        clientCount = conversationalService.retrieveCount();

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");   

-

-        // now test the second reference        

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }   

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        

-        String clientConversationId = serviceReference.getConversationID().toString();

-        String serverConfersationId = callableReference.endConversation();

-        

-        if (clientConversationId.equals("MyConversation2") &&

-            serverConfersationId.equals("MyConversation2") ) {

-            return clientConversationId;

-        } else {

-            return "client = " + clientConversationId +

-                   "server = " + serverConfersationId;

-        }     

-    }     

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }

-    public int runConversationWithCallback(){

-        calls.append("runConversationWithCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    

-    public String runConversationBusinessException(){

-	    calls.append("runConversationbusinessException,");	    

-	    try {

-            conversationalService.initializeCount(1);

-//            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-	    } catch(Exception ex) {

-	        return ex.getMessage();

-	    }

-         

-        return "No Exception Returned";

-    }

-	

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-//            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }	

-	

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }   

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    }   

-    

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        } 

-    }    

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-        

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount = 0;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ /dev/null
@@ -1,43 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.CallableReference;

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

-

-/**

- * A client component that accepts a reference to an ongoing conversation

- * and takes part in that conversation

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalReferenceClient.class})

-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{

-   

-    public void incrementCount(CallableReference<ConversationalService> conversationalService){

-        ConversationalService callableReference = conversationalService.getService();

-        

-        callableReference.incrementCount();        

-    }

-

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index 9f4857f703..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ /dev/null
@@ -1,124 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("REQUEST")

-public class ConversationalServiceRequestImpl implements ConversationalService {

-    

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // static area in which to hold conversational data

-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();

-   

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        Integer conversationalCount = new Integer(count); 

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        Integer conversationalCount = conversationalState.get(conversationId);

-        conversationalCount++;

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        Integer count = conversationalState.get(conversationId);

-        if (count != null){

-            return count.intValue();

-        } else {

-            return -999;

-        }

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }    

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,");

-        initializeCount(count);

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,");

-        incrementCount();

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,");

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        conversationalState.remove(conversationId);

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,");       

-        return conversationalCallback.endConversation();

-    }   

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index 4b06251414..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,119 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalServiceStatefulImpl implements ConversationalService {

-

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // local count - accumulates during the conversation

-    private int count = 0;

-          

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");       

-        this.count = count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");        

-        count++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,"); 

-        return count;

-    }

-    

-    public void businessException() throws BusinessException {

-        calls.append("businessException,");

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,"); 

-        this.count = count;

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,"); 

-        count++;

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,"); 

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }    

-    

-    public String endConversation(){

-        calls.append("endConversation,"); 

-        count = 0;

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,"); 

-        return conversationalCallback.endConversation();

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index be039748fc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,118 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

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

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalServiceNonConversationalCallback.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {

-

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected NonConversationalCallback nonConversationalCallback; 

-    

-    // local count - accumulates during the conversation

-    private int count = 0;

-          

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");       

-        this.count = count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");        

-        count++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,"); 

-        return count;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,"); 

-        this.count = count;

-        nonConversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,"); 

-        count++;

-        nonConversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,"); 

-        return nonConversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        nonConversationalCallback.businessException();

-    }    

-    

-    public String endConversation(){

-        calls.append("endConversation,"); 

-        count = 0;

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,"); 

-        return nonConversationalCallback.endConversation();

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 42f2f1a603..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,122 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-public class ConversationalServiceStatelessImpl implements ConversationalService {

-    

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // static area in which to hold conversational data

-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();

-   

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        Integer conversationalCount = new Integer(count); 

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        Integer conversationalCount = conversationalState.get(conversationId);

-        conversationalCount++;

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        Integer count = conversationalState.get(conversationId);

-        if (count != null){

-            return count.intValue();

-        } else {

-            return -999;

-        }

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }    

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,");

-        initializeCount(count);

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,");

-        incrementCount();

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,");

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        conversationalState.remove(conversationId);

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,");       

-        return conversationalCallback.endConversation();

-    }   

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index a852aeda56..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ /dev/null
@@ -1,94 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

-

-@Service(ConversationalService.class)

-public class ConversationalServiceStatelessScopeImpl implements ConversationalService {

-

-    @ConversationID

-    protected String cid;

-

-    static Map<String, Integer> state = new HashMap<String, Integer>();

-    

-    public void destroy() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public String endConversation() {

-        state.remove(cid);

-        return cid;

-    }

-

-    public String endConversationCallback() {

-        // TODO Auto-generated method stub

-        return null;

-        

-    }

-

-    public void incrementCount() {

-        state.put(cid, Integer.valueOf(state.get(cid)+1));

-    }

-

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }

-    

-    public void incrementCountCallback() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public void init() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public void initializeCount(int count) {

-        state.put(cid, Integer.valueOf(count));

-    }

-

-    public void initializeCountCallback(int count) {

-        // TODO Auto-generated method stub

-        

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }    

-

-    public int retrieveCount() {

-        return state.get(cid);

-    }

-

-    public int retrieveCountCallback() {

-        // TODO Auto-generated method stub

-        return 0;

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
deleted file mode 100644
index d5a1ff7410..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">

-    <deployable composite="conv:ConversationalITest" />

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
deleted file mode 100644
index c4da99145d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ /dev/null
@@ -1,169 +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://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://conversations"

-	name="ConversationalITest">

- 	      

-    <component name="ConversationalStatelessClientStatelessService">

-	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

-		<reference name="conversationalService" target="ConversationalServiceStatelessSL">

-		    <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatelessService"/>

-            </callback>

-        </reference>

-		<reference name="conversationalService2" target="ConversationalServiceStatelessSL">

-            <binding.ws/>

-        </reference> 		

-    </component>   

-    

-    <component name="ConversationalStatelessClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatefulService"/>

-            </callback>

-        </reference>

-        <reference name="conversationalService2" target="ConversationalServiceStateful">  

-            <binding.ws/>

-        </reference>     

-    </component>     

-    

-    <component name="ConversationalStatefulClientStatelessService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStatelessSL">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatelessService"/>

-            </callback>

-        </reference>

-        <reference name="conversationalService2" target="ConversationalServiceStatelessSL">

-            <binding.ws/>

-        </reference>        

-    </component>   

-    

-    <component name="ConversationalStatefulClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful">

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatefulService"/>

-            </callback>            

-        </reference>        

-        <reference name="conversationalService2" target="ConversationalServiceStateful">

-            <binding.ws/>

-        </reference>

-    </component>  

-    

-    <component name="ConversationalStatelessClientRequestService">

-	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

-        <reference name="conversationalService" target="ConversationalServiceRequest">

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientRequestService"/>

-            </callback>            

-        </reference>        

-        <reference name="conversationalService2" target="ConversationalServiceRequest">

-            <binding.ws/>

-        </reference>

-    </component> 

-    

-    <component name="ConversationalStatefulClientNonConversationalCallbackStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>

-        <reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback">

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientNonConversationalCallbackStatefulService"/>

-            </callback>            

-        </reference>        

-        <reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback">

-            <binding.ws/>

-        </reference>

-    </component>     

-    

-    <component name="ConversationalReferenceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>

-    </component>    

-        

-    <component name="ConversationalServiceStateful">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>

-		<service name="ConversationalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />		

-		    <binding.ws uri="http://localhost:8085/ConversationalServiceStateful"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-		</service>

-	</component>       

-   

-    <component name="ConversationalServiceStateless">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScopeImpl"/>

-	</component>  

-	

-    <component name="ConversationalServiceStatelessSL">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl"/>

-        <service name="ConversationalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       

-            <binding.ws uri="http://localhost:8085/ConversationalServiceStatelessSL"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-        </service>        

-    </component> 

-

-    <component name="ConversationalServiceRequest">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>

-        <service name="ConversationalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       

-            <binding.ws uri="http://localhost:8085/ConversationalServiceRequest"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-        </service>            

-    </component> 

-    

-    <component name="ConversationalServiceStatefulNonConversationalCallback">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>

-        <service name="ConversationalServiceNonConversationalCallback">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.NonConversationalCallback" />       

-            <binding.ws uri="http://localhost:8085/ConversationalServiceStatefulNonConversationalCallback"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-        </service> 		

-	</component>   

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
deleted file mode 100644
index 20a92c9dc7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ /dev/null
@@ -1,383 +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://conversational.itest.sca.tuscany.apache.org" 

-                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" 

-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 

-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 

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

-                  xmlns:ns0="http://conversational.itest.sca.tuscany.apache.org" 

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 

-                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" 

-                  xmlns:ns1="http://org.apache.axis2/xsd">

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://conversational.itest.sca.tuscany.apache.org" xmlns:ns="http://conversational.itest.sca.tuscany.apache.org">

-            <xs:element name="retrieveCountResponse">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" type="xs:int"/>

-                    </xs:sequence>

-                </xs:complexType>

-

-            </xs:element>

-            <xs:element name="retrieveCountCallbackResponse">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" type="xs:int"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="endConversationResponse">

-

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="endConversationCallbackResponse">

-                <xs:complexType>

-                    <xs:sequence>

-

-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="initializeCount">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="param0" type="xs:int"/>

-                    </xs:sequence>

-

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="initializeCountCallback">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="param0" type="xs:int"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-

-        <xs:element name="retrieveCount"><xs:complexType/></xs:element><xs:element name="endConversation"><xs:complexType/></xs:element><xs:element name="endConversationCallback"><xs:complexType/></xs:element><xs:element name="incrementCountCallback"><xs:complexType/></xs:element><xs:element name="incrementCountCallbackResponse"><xs:complexType/></xs:element><xs:element name="incrementCount"><xs:complexType/></xs:element><xs:element name="incrementCountResponse"><xs:complexType/></xs:element><xs:element name="initializeCountCallbackResponse"><xs:complexType/></xs:element><xs:element name="initializeCountResponse"><xs:complexType/></xs:element><xs:element name="retrieveCountCallback"><xs:complexType/></xs:element></xs:schema>

-  </wsdl:types>

-  <wsdl:message name="initializeCountCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:initializeCountCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="retrieveCountCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:retrieveCountCallback">

-    </wsdl:part>

-

-  </wsdl:message>

-  <wsdl:message name="incrementCountRequest">

-    <wsdl:part name="parameters" element="ns0:incrementCount">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="incrementCountCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:incrementCountCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-

-  <wsdl:message name="retrieveCountCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:retrieveCountCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="retrieveCountResponse">

-    <wsdl:part name="parameters" element="ns0:retrieveCountResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="endConversationResponse">

-

-    <wsdl:part name="parameters" element="ns0:endConversationResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="endConversationCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:endConversationCallback">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="incrementCountCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:incrementCountCallback">

-

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="retrieveCountRequest">

-    <wsdl:part name="parameters" element="ns0:retrieveCount">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="initializeCountRequest">

-    <wsdl:part name="parameters" element="ns0:initializeCount">

-    </wsdl:part>

-

-  </wsdl:message>

-  <wsdl:message name="initializeCountResponse">

-    <wsdl:part name="parameters" element="ns0:initializeCountResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="endConversationCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:endConversationCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-

-  <wsdl:message name="endConversationRequest">

-    <wsdl:part name="parameters" element="ns0:endConversation">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="initializeCountCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:initializeCountCallback">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="incrementCountResponse">

-

-    <wsdl:part name="parameters" element="ns0:incrementCountResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:portType name="ConversationalServicePortType">

-    <wsdl:operation name="retrieveCount">

-      <wsdl:input message="ns0:retrieveCountRequest" wsaw:Action="urn:retrieveCount">

-    </wsdl:input>

-      <wsdl:output message="ns0:retrieveCountResponse" wsaw:Action="urn:retrieveCountResponse">

-    </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="endConversation">

-      <wsdl:input message="ns0:endConversationRequest" wsaw:Action="urn:endConversation">

-    </wsdl:input>

-      <wsdl:output message="ns0:endConversationResponse" wsaw:Action="urn:endConversationResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="endConversationCallback">

-      <wsdl:input message="ns0:endConversationCallbackRequest" wsaw:Action="urn:endConversationCallback">

-

-    </wsdl:input>

-      <wsdl:output message="ns0:endConversationCallbackResponse" wsaw:Action="urn:endConversationCallbackResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="incrementCountCallback">

-      <wsdl:input message="ns0:incrementCountCallbackRequest" wsaw:Action="urn:incrementCountCallback">

-    </wsdl:input>

-      <wsdl:output message="ns0:incrementCountCallbackResponse" wsaw:Action="urn:incrementCountCallbackResponse">

-    </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="incrementCount">

-      <wsdl:input message="ns0:incrementCountRequest" wsaw:Action="urn:incrementCount">

-    </wsdl:input>

-      <wsdl:output message="ns0:incrementCountResponse" wsaw:Action="urn:incrementCountResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCountCallback">

-      <wsdl:input message="ns0:initializeCountCallbackRequest" wsaw:Action="urn:initializeCountCallback">

-

-    </wsdl:input>

-      <wsdl:output message="ns0:initializeCountCallbackResponse" wsaw:Action="urn:initializeCountCallbackResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCount">

-      <wsdl:input message="ns0:initializeCountRequest" wsaw:Action="urn:initializeCount">

-    </wsdl:input>

-      <wsdl:output message="ns0:initializeCountResponse" wsaw:Action="urn:initializeCountResponse">

-    </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="retrieveCountCallback">

-      <wsdl:input message="ns0:retrieveCountCallbackRequest" wsaw:Action="urn:retrieveCountCallback">

-    </wsdl:input>

-      <wsdl:output message="ns0:retrieveCountCallbackResponse" wsaw:Action="urn:retrieveCountCallbackResponse">

-    </wsdl:output>

-    </wsdl:operation>

-  </wsdl:portType>

-  <wsdl:binding name="ConversationalServiceSOAP11Binding" type="ns0:ConversationalServicePortType">

-

-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

-    <wsdl:operation name="retrieveCount">

-      <soap:operation soapAction="urn:retrieveCount" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="endConversation">

-      <soap:operation soapAction="urn:endConversation" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="endConversationCallback">

-      <soap:operation soapAction="urn:endConversationCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="incrementCountCallback">

-      <soap:operation soapAction="urn:incrementCountCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="incrementCount">

-      <soap:operation soapAction="urn:incrementCount" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="initializeCountCallback">

-      <soap:operation soapAction="urn:initializeCountCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="initializeCount">

-      <soap:operation soapAction="urn:initializeCount" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="retrieveCountCallback">

-      <soap:operation soapAction="urn:retrieveCountCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-  </wsdl:binding>

-  <wsdl:binding name="ConversationalServiceHttpBinding" type="ns0:ConversationalServicePortType">

-    <http:binding verb="POST"/>

-    <wsdl:operation name="retrieveCount">

-      <http:operation location="ConversationalService/retrieveCount"/>

-      <wsdl:input>

-        <mime:content part="retrieveCount" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="retrieveCount" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="endConversation">

-      <http:operation location="ConversationalService/endConversation"/>

-      <wsdl:input>

-        <mime:content part="endConversation" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="endConversation" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="endConversationCallback">

-      <http:operation location="ConversationalService/endConversationCallback"/>

-      <wsdl:input>

-        <mime:content part="endConversationCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="endConversationCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="incrementCountCallback">

-      <http:operation location="ConversationalService/incrementCountCallback"/>

-      <wsdl:input>

-        <mime:content part="incrementCountCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="incrementCountCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="incrementCount">

-      <http:operation location="ConversationalService/incrementCount"/>

-      <wsdl:input>

-        <mime:content part="incrementCount" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="incrementCount" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCountCallback">

-      <http:operation location="ConversationalService/initializeCountCallback"/>

-      <wsdl:input>

-        <mime:content part="initializeCountCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="initializeCountCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCount">

-      <http:operation location="ConversationalService/initializeCount"/>

-      <wsdl:input>

-        <mime:content part="initializeCount" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="initializeCount" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="retrieveCountCallback">

-      <http:operation location="ConversationalService/retrieveCountCallback"/>

-      <wsdl:input>

-        <mime:content part="retrieveCountCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="retrieveCountCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="ConversationalService">

-    <wsdl:port name="ConversationalServiceSOAP11port_http" binding="ns0:ConversationalServiceSOAP11Binding">

-      <soap:address location="http://localhost:8085/ConversationalServiceStateful"/>

-    </wsdl:port>

-

-    <wsdl:port name="ConversationalServiceHttpport" binding="ns0:ConversationalServiceHttpBinding">

-      <http:address location="http://localhost:8085/ConversationalServiceStateful"/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
deleted file mode 100644
index 73d078674c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">

-    <deployable composite="conv:ConversationalWSDLITest" />

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
deleted file mode 100644
index 9c6b0a2b34..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ /dev/null
@@ -1,46 +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://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://conversations"

-	name="ConversationalWSDLITest">

- 	      

-    <component name="ConversationalStatelessClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful">

-           <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>

-        </reference>

-        <reference name="conversationalService2" target="ConversationalServiceStateful">  

-            <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>

-        </reference>     

-    </component>     

-       

-    <component name="ConversationalServiceStateful">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>

-		<service name="ConversationalService">

-		    <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>

-		</service>

-    </component>  

-      

-    <component name="ConversationalReferenceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>

-    </component> 

-   

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
deleted file mode 100644
index d05e4712a1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ /dev/null
@@ -1,75 +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.itest.conversational;

-

-

-import java.io.File;

-

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

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

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

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

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

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ConversationWSDLTestCase {

-

-    private SCANode2 node; 

-    private ConversationalClient conversationalStatelessClientStatefulService;    

-

-    @Before

-    public void setUp() throws Exception {

-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-        node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

-                                         new SCAContribution("TestContribution", 

-                                                                     new File("src/main/resources/ConversationalWSDL").toURL().toString()));

-                

-         

-        node.start();

-        

-        conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");

-        

-        

-        ConversationalClientStatelessImpl.calls  = new StringBuffer(); 

-    }

-

-    @After

-    public void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatefulService = null;

-    }

-

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    //@Test

-    public void testKeepServerRunning() throws Exception {

-        System.out.println("press enter to continue");

-        System.in.read();

-    }    

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
deleted file mode 100644
index 7eec461476..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ /dev/null
@@ -1,198 +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.itest.conversational;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class NonConversationalCallbackTestCase {

-

-    private static SCANode2 node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-    	try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientStatelessService");

-	

-	    conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientStatefulService");

-	

-	    conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientStatelessService");

-	

-	    conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientStatefulService");

-	    conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientRequestService");

-	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-	        

-	    // reset the place where we record the sequence of calls passing

-	    // through each component instance

-	    ConversationalServiceStatelessImpl.calls = new StringBuffer();

-	    ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-	    ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-	    ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-    	} catch(Exception ex) {

-    		System.err.println(ex.toString());

-    	}

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateful client non conversational callback stateful service tests  

-    // ==================================================================

-   

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() {

-        resetCallStack();

-    	ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-    	conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-        		            ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());

-    }  

-

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {

-        resetCallStack();

-    	ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-        		           ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());        

-    }   

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(0, count);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }    

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals("MyConversation3", id);

-    } 

-    

-       

-        

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
deleted file mode 100644
index 39ab4319f7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ /dev/null
@@ -1,209 +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.itest.conversational;

-

-import java.io.File;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class RequestScopeTestCase {

-

-    private static SCANode2 node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateless client request scope service tests

-    // ============================================

-    @Test

-    public void testStatelessRequestConversationFromInjectedReference() {

-        int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    //@Test

-    public void testStatelessRequestConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2();

-        Assert.assertEquals(1, count);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationFromServiceReference() {

-        int count = conversationalStatelessClientRequestService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-   

-    @Test

-    public void testStatelessRequestConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }   

-    

-    //@Test

-    public void testStatelessRequestConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    //@Test

-    public void testStatelessRequestConversationCheckingScope() {

-        resetCallStack();

-    	ConversationalServiceRequestImpl.calls = new StringBuffer();

-    	conversationalStatelessClientRequestService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,", 

-        		            ConversationalServiceRequestImpl.calls.toString());

-        //init,initializeCount,init,incrementCount,init,retrieveCount,init,endConversation,

-    }     

-

-    @Test

-    public void testStatelessRequestConversationWithCallback() {

-        resetCallStack();

-    	ConversationalClientStatelessImpl.calls = new StringBuffer();    	

-        int count = conversationalStatelessClientRequestService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }  

-    

-    //@Test

-    public void testStatelessRequestConversationHavingPassedReference() {

-        int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }    

-  

-    //@Test

-    public void testStatelessRequestConversationBusinessException() {

-        String message = conversationalStatelessClientRequestService.runConversationBusinessException();

-        Assert.assertEquals("Business Exception", message);

-    }     

-    

-    //@Test

-    public void testStatelessRequestConversationBusinessExceptionCallback() {

-        String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback();

-        Assert.assertEquals("Business Exception", message);

-    }  

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }  

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-        

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
deleted file mode 100644
index 28df937283..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ /dev/null
@@ -1,193 +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.itest.conversational;

-

-import java.io.File;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatefulStatefulTestCase {

-

-    private static SCANode2 node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateful client stateful service tests  

-    // ======================================

-    @Test

-    public void testStatefulStatefulConversationFromInjectedReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatefulStatefulConversationFromServiceReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-    

-    @Test

-    public void testStatefulStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-   

-    @Test

-    public void testStatefulStatefulConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatefulClientStatefulService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalServiceStatefulImpl.calls.toString());

-    }  

-

-    @Test

-    public void testStatefulStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientStatefulService.runConversationWithCallback();

-        Assert.assertEquals(4, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalClientStatefulImpl.calls.toString());        

-    }   

-    

-    //@Test

-    public void testStatefulStatefulConversationHavingPassedReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }    

-    

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-        

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
deleted file mode 100644
index 02295b0ca6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ /dev/null
@@ -1,193 +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.itest.conversational;

-

-import java.io.File;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatefulStatelessTestCase {

-

-    private static SCANode2 node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateful client stateless service tests  

-    // =======================================

-    @Test

-    public void testStatefulStatelessConversationFromInjectedReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulStatelessConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatelessConversationFromServiceReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatelessConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-

-    @Test

-    public void testStatefulStatelessConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatefulStatelessConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatefulClientStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-                            ConversationalServiceStatelessImpl.calls.toString());

-    } 

-

-    @Test

-    public void testStatefulStatelessConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientStatelessService.runConversationWithCallback();

-        Assert.assertEquals(4, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalClientStatefulImpl.calls.toString());        

-    }     

-    

-    //@Test

-    public void testStatefulStatelessConversationHavingPassedReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }  

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }      

-        

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
deleted file mode 100644
index fce6ee0d50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ /dev/null
@@ -1,205 +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.itest.conversational;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatelessStatefulTestCase {

-

-    private static SCANode2 node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateless client stateful service tests

-    // =======================================

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationFromServiceReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-

-    @Test

-    public void testStatelessStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }   

-   

-    @Test

-    public void testStatelessStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatelessStatefulConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatelessClientStatefulService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalServiceStatefulImpl.calls.toString());

-    }     

-

-    @Test

-    public void testStatelessStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatelessClientStatefulService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }  

-   

-    //@Test

-    public void testStatelessStatefulConversationHavingPassedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }    

- 

-    //@Test

-    public void testStatelessStatefulConversationBusinessException() {

-        String message = conversationalStatelessClientStatefulService.runConversationBusinessException();

-        Assert.assertEquals("Business Exception", message);

-    }     

-

-    //@Test

-    public void testStatelessStatefulConversationBusinessExceptionCallback() {

-        String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();

-        Assert.assertEquals("Business Exception", message);

-    }  

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }   

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    } 

-

-        

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
deleted file mode 100644
index 6df7767823..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ /dev/null
@@ -1,192 +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.itest.conversational;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatelessStatelessTestCase {

-

-    private static SCANode2 node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-

-    // stateless client stateless service tests

-    // ========================================

-   

-    @Test

-    public void testStatelessStatelessConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-

-    @Test

-    public void testStatelessStatelessConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationFromServiceReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatelessStatelessConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }  

-    @Test

-    public void testStatelessStatelessConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatelessClientStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-                            ConversationalServiceStatelessImpl.calls.toString());

-    }       

-    

-    @Test

-    public void testStatelessStatelessConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatelessClientStatelessService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }

-    //@Test

-    public void testStatelessStatelessConversationHavingPassedReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }     

-

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    } 

-    

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/pom.xml b/tags/java/sca/1.3-RC1a/itest/conversations/pom.xml
deleted file mode 100644
index 5c8ec2cbc5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-conversations</artifactId>
-    <name>Apache Tuscany SCA Conversations Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
deleted file mode 100644
index a3b83dfc14..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ /dev/null
@@ -1,29 +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.itest;
-
-import java.io.Serializable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Record implements Serializable {
-    public String id;
-    public String conversationId;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
deleted file mode 100644
index 8e98b9cbd4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.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 org.apache.tuscany.sca.itest;
-
-import java.util.Hashtable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestResult {
-    public static Hashtable<Object, Boolean> results = new Hashtable<Object, Boolean>();
-    private static int completed = 0;
-    public static synchronized void updateCompleted() {
-        ++completed;
-    }
-    
-    public static synchronized int getCompleted() {
-        return completed;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
deleted file mode 100644
index e7583c339a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ /dev/null
@@ -1,56 +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.itest.conversational;

-

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

-

-/**

- * Simple conversational Service that uses another Conversational Service

- */

-@Conversational

-public interface AService {

-

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    String getState();

-

-    /**

-     * Returns the state for the other service that this service is using

-     * 

-     * @return The state for the other service that this service is using

-     */

-    String getStateOnB();

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    void setState(String aState);

-

-    /**

-     * Sets the state for the other service that this service is using

-     * 

-     * @param aState The state for the other service that this service is using

-     */

-    void setStateOnB(String aState);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
deleted file mode 100644
index bc4a5fc571..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ /dev/null
@@ -1,32 +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.itest.conversational;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface Alpha {
-    @OneWay
-    void run(int param);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
deleted file mode 100644
index 77d7f4c007..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ /dev/null
@@ -1,42 +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.itest.conversational;

-

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

-

-/**

- * Simple conversational Service

- */

-@Conversational

-public interface BService {

-    

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    String getState();

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    void setState(String aState);

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
deleted file mode 100644
index e422938b27..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ /dev/null
@@ -1,31 +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.itest.conversational;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface Beta {
-    CallableReference<Gamma> getRef(int param);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
deleted file mode 100644
index a6dbf56797..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ /dev/null
@@ -1,42 +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.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Conversational
-public interface CService {
-
-    String getState();
-
-    void setState(String aState);
-    
-    Object getConversationID();
-    
-    Object getConversationObjectConversationId();
-        
-    void setConversationID(String theID);
-    
-    void endConversation();
-    
-    void endConversationViaAnnotatedMethod();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
deleted file mode 100644
index 3f04e9f09e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.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 org.apache.tuscany.sca.itest.conversational;

-

-public interface Constants {

-

-    String A_INITIAL_VALUE = "Initial Value of A";

-    String B_INITIAL_VALUE = "Initial Value of B";

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index 53dadc3dc7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ /dev/null
@@ -1,29 +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.itest.conversational;

-

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

-

-@Conversational

-public interface ConversationIdService {

-

-    String getCIDField();

-    String getCIDSetter();

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index 8cad88d2f4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +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.itest.conversational;

-

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

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

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

-

-

-/**

- * The callback interface used when testing conversational callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-public interface ConversationalCallback {

-	

-    public void init();

-    

-    public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws Exception;        

-    

-    @EndsConversation

-    public String endConversation();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 2532346349..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ /dev/null
@@ -1,50 +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.itest.conversational;

-

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

-

-/**

- * The client for the conversational itest. Is implemented by clients

- * offering both stateless and stateful callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Remotable

-public interface ConversationalClient { 

-	

-	public int runConversationFromInjectedReference();

-	public int runConversationFromInjectedReference2();

-	public int runConversationFromServiceReference();

-	public int runConversationWithUserDefinedConversationId();

-	public String runConversationCheckUserDefinedConversationId();	

-	public int runConversationCheckingScope();

-	public int runConversationWithCallback(); 

-	public int runConversationHavingPassedReference();

-	public String runConversationBusinessException();

-	public String runConversationBusinessExceptionCallback();

-	public int runConversationCallingEndedConversation();

-	public int runConversationCallingEndedConversationCallback();

-        public String runConversationCallingEndedConversationCheckConversationId(); 

-	public String runConversationCallingEndedConversationCallbackCheckConversationId();

-	public int runConversationAgeTimeout();

-	public int runConversationIdleTimeout();

-	public int runConversationPrincipleError();	

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.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 org.apache.tuscany.sca.itest.conversational;

-

-import org.osoa.sca.CallableReference;

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

-

-/**

- * The client that calls into an existing conversation by accepting

- * a reference to that conversation

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Remotable

-public interface ConversationalReferenceClient { 

-	

-    public void incrementCount(CallableReference<ConversationalService> conversationalService);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 546382cfd1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ /dev/null
@@ -1,62 +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.itest.conversational;

-

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

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

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

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

-

-

-/**

- * The service interface used when testing conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-@Callback(ConversationalCallback.class)

-public interface ConversationalService {

-	

-    public void init();

-    

-    public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws Exception;        

-    

-    public void initializeCountCallback(int count);

-    

-    public void incrementCountCallback();

-    

-    public int retrieveCountCallback();

-    

-    public void businessExceptionCallback() throws Exception;    

-    

-    @EndsConversation

-    public String endConversation();

-    

-    public String endConversationCallback();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index f1a21cc18f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ /dev/null
@@ -1,62 +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.itest.conversational;

-

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

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

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

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

-

-

-/**

- * The service interface used when testing conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-@Callback(NonConversationalCallback.class)

-public interface ConversationalServiceNonConversationalCallback {

-	

-    public void init();

-    

-    public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws Exception;        

-    

-    public void initializeCountCallback(int count);

-    

-    public void incrementCountCallback();

-    

-    public int retrieveCountCallback();

-    

-    public void businessExceptionCallback() throws Exception;    

-    

-    @EndsConversation

-    public String endConversation();

-    

-    public String endConversationCallback();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
deleted file mode 100644
index 74afbfb763..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ /dev/null
@@ -1,46 +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.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-
-/**
- * Simple conversational Service
- */
-@Conversational
-public interface DService {
-    
-    /**
-     * Returns the state for this service.
-     * 
-     * @return The state for this service
-     */
-    String getState();
-
-    /**
-     * Sets the state for this service.
-     * 
-     * @param aState The state for this service
-     */
-    void setState(String aState);
-    
-    @EndsConversation
-    void endConversationViaAnnotatedMethod();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
deleted file mode 100644
index 5f97b16088..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ /dev/null
@@ -1,41 +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.itest.conversational;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-@Conversational
-public interface Gamma {
-    void start(int param);
-
-    boolean hasNext();
-
-    Record next();
-
-    @EndsConversation
-    void stop();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index 3ce3e3ada7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ /dev/null
@@ -1,46 +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.itest.conversational;

-

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

-

-

-/**

- * The callback interface used when testing conversational callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-public interface NonConversationalCallback {

-	

-    public void init();

-    

-    public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws Exception;        

-    

-    public String endConversation();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
deleted file mode 100644
index 95c9c7ae6e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ /dev/null
@@ -1,111 +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.itest.conversational.impl;

-

-import java.lang.reflect.Proxy;

-import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler;

-

-import org.apache.tuscany.sca.itest.conversational.AService;

-import org.apache.tuscany.sca.itest.conversational.BService;

-import org.apache.tuscany.sca.itest.conversational.Constants;

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

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

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

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

-

-/**

- * Simple conversational Service that uses another Conversational Service

- */

-@Service(AService.class)

-@Scope("CONVERSATION")

-public class AServiceImpl implements AService {

-

-    /**

-     * The state 

-     */

-    private String state = Constants.A_INITIAL_VALUE;

-    

-    /**

-     * The reference to the other service

-     */

-    private BService b;

-    

-    /**

-     * Constructor

-     *

-     */

-    public AServiceImpl() {

-        System.out.println("---> AServiceImpl constructor for " + this);

-    }

-

-    /**

-     * Inject the reference to the other service

-     * @param aB The other service.

-     */

-    @Reference(name="b")

-    public void setB(BService aB) {

-        System.out.println("---> Setting reference to B on " + this + " to " + aB);

-        this.b = aB;

-    }

-    

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    public String getState() {

-        return state;

-    }

-

-    /**

-     * Returns the state for the other service that this service is using

-     * 

-     * @return The state for the other service that this service is using

-     */

-    public String getStateOnB() {

-        return b.getState();

-    }

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    public void setState(String aState) {

-        this.state = aState;

-    }

-

-    /**

-     * Sets the state for the other service that this service is using

-     * 

-     * @param aState The state for the other service that this service is using

-     */

-    public void setStateOnB(String aState) {

-        b.setState(aState);

-    }

-    

-    /**

-     * Sets the conversation ID for this service

-     * @param id The Conversation ID

-     */

-    @ConversationID

-    public void setConversationID(String id) {

-        System.out.println("Conversation ID for " + this + " is set to " + id);

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
deleted file mode 100644
index a5f37f7a52..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ /dev/null
@@ -1,70 +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.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.apache.tuscany.sca.itest.TestResult;
-import org.apache.tuscany.sca.itest.conversational.Alpha;
-import org.apache.tuscany.sca.itest.conversational.Beta;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Alpha.class)
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
-    @Reference
-    public Beta beta;
-    
-    @Context
-    protected ComponentContext componentContext;
-    
-    public void run(int param) {
-        CallableReference<Gamma> gammaRef = null;
-        boolean testPassed = true;
-        try {
-            gammaRef = beta.getRef(param);
-            while (gammaRef.getService().hasNext()) {
-                Record record = gammaRef.getService().next();
-                if (!record.conversationId.equals(gammaRef.getConversation().getConversationID())) {
-                    // Record returned is not from this conversation.
-                    testPassed = false;
-                }
-            }
-        } catch (Exception ex) {
-            testPassed = false;
-            ex.printStackTrace();
-        } finally {
-            TestResult.updateCompleted();
-            if (gammaRef != null) {
-                TestResult.results.put(gammaRef.getConversation()
-                        .getConversationID(), testPassed);
-                gammaRef.getService().stop();
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
deleted file mode 100644
index c1e27641ef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ /dev/null
@@ -1,73 +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.itest.conversational.impl;

-

-

-import org.apache.tuscany.sca.itest.conversational.BService;

-import org.apache.tuscany.sca.itest.conversational.Constants;

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

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

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

-

-/**

- * Simple conversational Service

- */

-@Service(BService.class)

-@Scope("CONVERSATION")

-public class BServiceImpl implements BService {

-

-    /**

-     * The state for this service

-     */

-    private String state = Constants.B_INITIAL_VALUE;

-

-    /**

-     * Constructor

-     */

-    public BServiceImpl() {

-        System.out.println("---> BServiceImpl constructor for " + this);

-    }

-    

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    public String getState() {

-        return state;

-    }

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    public void setState(String aState) {

-        this.state = aState;

-    }

-

-    /**

-     * Sets the conversation ID for this service

-     * @param id The Conversation ID

-     */

-    @ConversationID

-    public void setConversationID(String id) {

-        System.out.println("Conversation ID for " + this + " is set to " + id);

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
deleted file mode 100644
index 900b8f743f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.Beta;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Beta.class)
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta {
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    public Gamma gamma;
-
-    public CallableReference<Gamma> getRef(int param) {
-        ServiceReference<Gamma> gammaRef = componentContext
-                .getServiceReference(Gamma.class, "gamma");
-        Gamma g = gammaRef.getService();
-        g.start(param);
-        return gammaRef;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
deleted file mode 100644
index b21f956bd9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ /dev/null
@@ -1,85 +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.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.CService;
-import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    private ServiceReference<DService> dServiceRef;
-
-    @Reference(name = "d")
-    public void setD(ServiceReference<DService> servRef) {
-        this.dServiceRef = servRef;
-    }
-
-    public String getState() {
-        return dServiceRef.getService().getState();
-    }
-
-    public void setState(String aState) {
-        dServiceRef.getService().setState(aState);
-    }
-
-
-    /*
-     * When the coversationId is set manually the client may access the 
-     * conversation id that will be used by the reference using 
-     * ServiceReference.getConversationId()
-     */
-    public Object getConversationID() {
-        return dServiceRef.getConversationID();
-    }
-    
-    /*
-     * Whether the conversation ID is chosen by the client or is generated by
-     * the system, the client may access the conversation ID by calling
-     * Conversation.getConversationID().
-     */    
-    public Object getConversationObjectConversationId() {
-        // TODO Auto-generated method stub
-        if (dServiceRef.getConversation() != null){
-            return dServiceRef.getConversation().getConversationID();
-        } else {
-            return null;
-        }
-    }
-
-    public void endConversation() {
-        dServiceRef.getConversation().end();
-    }
-
-    public void endConversationViaAnnotatedMethod() {
-        dServiceRef.getService().endConversationViaAnnotatedMethod();
-    }
-
-    public void setConversationID(String theID) {
-        dServiceRef.setConversationID(theID);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 9deef312ac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ /dev/null
@@ -1,75 +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.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
-public class ConversationAgeComponentImpl implements ConversationalService {
-
-    private int count;
-    
-    public void businessException() throws Exception {   
-    }
-    
-    public void businessExceptionCallback() throws Exception {   
-    }      
-
-    public void destroy() {
-    }
-
-    public String endConversation() {
-        return null;
-    }
-
-    public String endConversationCallback() {
-        return null;
-    }
-
-    public void incrementCount() {
-    }
-
-    public void incrementCountCallback() {
-    }
-
-    public void init() {
-    }
-
-    public void initializeCount(int count) {
-        this.count = count;
-    }
-
-    public void initializeCountCallback(int count) {
-    }
-
-    public int retrieveCount() {
-        return count;
-    }
-
-    public int retrieveCountCallback() {
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index cffa76186a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.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 org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationIdService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationIdService.class)
-@Scope("CONVERSATION")
-public class ConversationIdComponentImpl implements ConversationIdService {
-
-    @ConversationID
-    public String cid;
-
-    private String setterCid;
-    
-    public String getCIDField() {
-        return cid;
-    }
-    public String getCIDSetter() {
-        return setterCid;
-    }
-    
-
-    @ConversationID
-    public void setCID(String cid) {
-        this.setterCid = cid;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 1272c7ab7f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ /dev/null
@@ -1,75 +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.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class ConversationMaxIdleComponentImpl implements ConversationalService {
-
-    private int count;
-
-    public void businessException() throws Exception {   
-    }
-    
-    public void businessExceptionCallback() throws Exception {   
-    }    
-    
-    public void destroy() {
-    }
-
-    public String endConversation() {
-        return null;
-    }
-
-    public String endConversationCallback() {
-        return null;
-    }
-
-    public void incrementCount() {
-    }
-
-    public void incrementCountCallback() {
-    }
-
-    public void init() {
-    }
-
-    public void initializeCount(int count) {
-        this.count = count;
-    }
-
-    public void initializeCountCallback(int count) {
-    }
-
-    public int retrieveCount() {
-        return count;
-    }
-
-    public int retrieveCountCallback() {
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 847b038881..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,321 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

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

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

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

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {

-    

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-      

-    private int clientCount = 0;

-    private int callbackCount = 0;  

-    

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();        

-	

-    // From ConversationalClient

-	public int runConversationFromInjectedReference(){

-	    calls.append("runConversationFromInjectedReference,");	    

-	    conversationalService.initializeCount(1);

-	    conversationalService.incrementCount();

-	    clientCount = conversationalService.retrieveCount();

-	    conversationalService.endConversation();

-	    

-	    return clientCount;

-	}

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");

-               

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }	

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        

-        String clientConversationId = serviceReference.getConversationID().toString();

-        String serverConversationId = callableReference.endConversation();

-        

-        if (clientConversationId.equals("MyConversation2") &&

-            serverConversationId.equals("MyConversation2") ) {

-            return clientConversationId;

-        } else {

-            return "client = " + clientConversationId +

-                   "server = " + serverConversationId;

-        }  

-              

-    }      

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }    

-	public int runConversationWithCallback(){

-	    calls.append("runConversationWithCallback,");

-	    callbackCount = 2;

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        serviceReference.getConversation().end();

-        

-        return clientCount;

-    }

-    public String runConversationBusinessException(){

-        calls.append("runConversationbusinessException,");      

-        try {

-            conversationalService.initializeCount(1);

-            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }

-    

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }   

-    

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }       

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    } 

-     

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,"); 

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount += count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index b77e4c0194..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,310 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

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

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

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

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {

-    

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-      

-    private int clientCount = 0;

-    private int callbackCount = 0;  

-    

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();        

-	

-    // From ConversationalClient

-	public int runConversationFromInjectedReference(){

-	    calls.append("runConversationFromInjectedReference,");	    

-	    conversationalService.initializeCount(1);

-	    conversationalService.incrementCount();

-	    clientCount = conversationalService.retrieveCount();

-	    conversationalService.endConversation();

-	    

-	    return clientCount;

-	}

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");

-               

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }	

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        return callableReference.endConversation();

-              

-    }      

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }    

-	public int runConversationWithCallback(){

-	    calls.append("runConversationWithCallback,");

-	    callbackCount = 2;

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }

-    public String runConversationBusinessException(){

-        calls.append("runConversationbusinessException,");      

-        try {

-            conversationalService.initializeCount(1);

-            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }

-    

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }   

-    

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }     

-    

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }   

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    }  

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,"); 

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount += count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index 5b3906fc2c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,317 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

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

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

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {

-   

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-    

-    private int clientCount = 0;

-    private int callbackCount = 0;

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();    

-	

-    // From ConversationalClient

-    public int runConversationFromInjectedReference(){

-        calls.append("runConversationFromInjectedReference,");

-        conversationalService.initializeCount(1);

-        conversationalService.incrementCount();

-        clientCount = conversationalService.retrieveCount();

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");   

-

-        // now test the second reference        

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }   

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        

-        String clientConversationId = serviceReference.getConversationID().toString();

-        String serverConfersationId = callableReference.endConversation();

-        

-        if (clientConversationId.equals("MyConversation2") &&

-            serverConfersationId.equals("MyConversation2") ) {

-            return clientConversationId;

-        } else {

-            return "client = " + clientConversationId +

-                   "server = " + serverConfersationId;

-        }     

-    }     

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }

-    public int runConversationWithCallback(){

-        calls.append("runConversationWithCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    

-    public String runConversationBusinessException(){

-	    calls.append("runConversationbusinessException,");	    

-	    try {

-            conversationalService.initializeCount(1);

-            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-	    } catch(Exception ex) {

-	        return ex.getMessage();

-	    }

-         

-        return "No Exception Returned";

-    }

-	

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }	

-	

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }   

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    }   

-    

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        } 

-    }    

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-        

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount = 0;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ /dev/null
@@ -1,43 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.CallableReference;

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

-

-/**

- * A client component that accepts a reference to an ongoing conversation

- * and takes part in that conversation

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalReferenceClient.class})

-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{

-   

-    public void incrementCount(CallableReference<ConversationalService> conversationalService){

-        ConversationalService callableReference = conversationalService.getService();

-        

-        callableReference.incrementCount();        

-    }

-

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index 9a25f0f59a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ /dev/null
@@ -1,123 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("REQUEST")

-public class ConversationalServiceRequestImpl implements ConversationalService {

-    

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // static area in which to hold conversational data

-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();

-   

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        Integer conversationalCount = new Integer(count); 

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        Integer conversationalCount = conversationalState.get(conversationId);

-        conversationalCount++;

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        Integer count = conversationalState.get(conversationId);

-        if (count != null){

-            return count.intValue();

-        } else {

-            return -999;

-        }

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }    

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,");

-        initializeCount(count);

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,");

-        incrementCount();

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,");

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws Exception {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        conversationalState.remove(conversationId);

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,");       

-        return conversationalCallback.endConversation();

-    }   

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index efcbdff06f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,117 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalServiceStatefulImpl implements ConversationalService {

-

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // local count - accumulates during the conversation

-    private int count = 0;

-          

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");       

-        this.count = count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");        

-        count++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,"); 

-        return count;

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,"); 

-        this.count = count;

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,"); 

-        count++;

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,"); 

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws Exception {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }    

-    

-    public String endConversation(){

-        calls.append("endConversation,"); 

-        count = 0;

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,"); 

-        return conversationalCallback.endConversation();

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index 8454b3846b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,117 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

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

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalServiceNonConversationalCallback.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {

-

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected NonConversationalCallback nonConversationalCallback; 

-    

-    // local count - accumulates during the conversation

-    private int count = 0;

-          

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");       

-        this.count = count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");        

-        count++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,"); 

-        return count;

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,"); 

-        this.count = count;

-        nonConversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,"); 

-        count++;

-        nonConversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,"); 

-        return nonConversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws Exception {

-        calls.append("businessExceptionCallback,");        

-        nonConversationalCallback.businessException();

-    }    

-    

-    public String endConversation(){

-        calls.append("endConversation,"); 

-        count = 0;

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,"); 

-        return nonConversationalCallback.endConversation();

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 07186c91e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,123 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

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

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

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

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

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("STATELESS")

-public class ConversationalServiceStatelessImpl implements ConversationalService {

-    

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // static area in which to hold conversational data

-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();

-   

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        Integer conversationalCount = new Integer(count); 

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        Integer conversationalCount = conversationalState.get(conversationId);

-        conversationalCount++;

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        Integer count = conversationalState.get(conversationId);

-        if (count != null){

-            return count.intValue();

-        } else {

-            return -999;

-        }

-    }

-    

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }    

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,");

-        initializeCount(count);

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,");

-        incrementCount();

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,");

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws Exception {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        conversationalState.remove(conversationId);

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,");       

-        return conversationalCallback.endConversation();

-    }   

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index 344aa99dff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ /dev/null
@@ -1,93 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

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

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

-

-@Service(ConversationalService.class)

-public class ConversationalServiceStatelessScopeImpl implements ConversationalService {

-

-    @ConversationID

-    protected String cid;

-

-    static Map<String, Integer> state = new HashMap<String, Integer>();

-    

-    public void destroy() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public String endConversation() {

-        state.remove(cid);

-        return cid;

-    }

-

-    public String endConversationCallback() {

-        // TODO Auto-generated method stub

-        return null;

-        

-    }

-

-    public void incrementCount() {

-        state.put(cid, Integer.valueOf(state.get(cid)+1));

-    }

-

-    public void businessException() throws Exception {

-        throw new Exception("Business Exception");

-    }

-    

-    public void incrementCountCallback() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public void init() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public void initializeCount(int count) {

-        state.put(cid, Integer.valueOf(count));

-    }

-

-    public void initializeCountCallback(int count) {

-        // TODO Auto-generated method stub

-        

-    }

-    

-    public void businessExceptionCallback() throws Exception {

-        throw new Exception("Business Exception");

-    }    

-

-    public int retrieveCount() {

-        return state.get(cid);

-    }

-

-    public int retrieveCountCallback() {

-        // TODO Auto-generated method stub

-        return 0;

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
deleted file mode 100644
index 8d79bb75e8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ /dev/null
@@ -1,71 +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.itest.conversational.impl;
-
-
-import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service
- */
-@Service(DService.class)
-@Scope("CONVERSATION")
-public class DServiceImpl implements DService {
-
-    /**
-     * The state for this service
-     */
-    private String state = "Initial state value";
-
-    /**
-     * Returns the state for this service.
-     * 
-     * @return The state for this service
-     */
-    public String getState() {
-        return state;
-    }
-
-    /**
-     * Sets the state for this service.
-     * 
-     * @param aState The state for this service
-     */
-    public void setState(String aState) {
-        this.state = aState;
-    }
-
-    /**
-     * Sets the conversation ID for this service
-     * @param id The Conversation ID
-     */
-    @ConversationID
-    public void setConversationID(String id) {
-        System.out.println ("Setting conversation ID at service = " + id );
-    }
-    
-    public void endConversationViaAnnotatedMethod() {
-        System.out.println ("Annotated Ends Conversation");
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
deleted file mode 100644
index d1b769216b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.ArrayList;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Gamma.class)
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma {
-    @ConversationID
-    public String conversationId;
-
-    private ArrayList<Record> list;
-    
-    public void start(int param) {
-        list = new ArrayList<Record>();
-        fillList(param, conversationId);
-    }
-
-    public boolean hasNext() {
-        return !list.isEmpty();
-    }
-
-    public Record next() {
-        return list.remove(0);
-    }
-
-    public void stop() {
-        list = null;
-    }
-    
-    private void fillList(int param, String cid) {
-        for (int i = 0; i < param; i++) {
-            Record record = new Record();
-            record.id = "id_" + i;
-            record.conversationId = cid;
-            list.add(record);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/ConversationAge.composite b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/ConversationAge.composite
deleted file mode 100644
index abd1c35ced..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/ConversationAge.composite
+++ /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.

--->

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

-	name="ConversationalIdTest">

- 	      

-    <component name="ConversationAgeComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationAgeComponentImpl"/>

-	</component>          

-     

-    <component name="ConversationIdleComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationMaxIdleComponentImpl"/>

-	</component>          

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/ConversationUniqueId.composite b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/ConversationUniqueId.composite
deleted file mode 100644
index 831449a079..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ /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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://conversations"
-    name="ConversationUniqueIdTest">
-
-    <component name="Alpha">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.AlphaImpl"/>
-        <service name="Alpha">
-            <binding.sca />
-        </service>
-        <reference name="beta" target="Beta">
-            <binding.sca/>
-        </reference>
-    </component>
-
-    <component name="Beta">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.BetaImpl"/>
-        <service name="Beta">
-            <binding.sca />
-        </service>
-        <reference name="gamma" target="Gamma">
-            <binding.sca />
-        </reference>
-    </component>
-
-    <component name="Gamma">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.GammaImpl"/>
-        <service name="Gamma">
-            <binding.sca/>
-        </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversationId.composite b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversationId.composite
deleted file mode 100644
index e61eb08194..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversationId.composite
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0"

-	name="ConversationalIdTest">

- 	      

-    <component name="ConversationIdComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationIdComponentImpl"/>

-	</component>          

-     

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversationLifetime.composite b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversationLifetime.composite
deleted file mode 100644
index 3b79dc43d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversationLifetime.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://conversations"
-	name="conversationLifetimeTest">
-
-    <component name="ConversationalCComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.CServiceImpl"/>
-        <reference name="d" target="ConversationalDComponent" />
-    </component>
-
-    <component name="ConversationalDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.DServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversational.composite b/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversational.composite
deleted file mode 100644
index 4da3ce74d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/main/resources/conversational.composite
+++ /dev/null
@@ -1,99 +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://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://conversations"

-	name="ConversationalITest">

- 	      

-    <component name="ConversationalStatelessClientStatelessService">

-	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

-		<reference name="conversationalService" target="ConversationalServiceStatelessSL"/>

-		<reference name="conversationalService2" target="ConversationalServiceStatelessSL"/>

-    </component>   

-    

-    <component name="ConversationalStatelessClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful"/>

-        <reference name="conversationalService2" target="ConversationalServiceStateful"/>        

-    </component>     

-    

-    <component name="ConversationalStatefulClientStatelessService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStatelessSL"/>

-        <reference name="conversationalService2" target="ConversationalServiceStatelessSL"/>        

-    </component>   

-    

-    <component name="ConversationalStatefulClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful"/>

-        <reference name="conversationalService2" target="ConversationalServiceStateful"/>        

-    </component>  

-    

-    <component name="ConversationalStatelessClientRequestService">

-	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

-		<reference name="conversationalService" target="ConversationalServiceRequest"/>

-		<reference name="conversationalService2" target="ConversationalServiceRequest"/>

-    </component> 

-    

-    <component name="ConversationalStatefulClientNonConversationalCallbackStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback"/>

-        <reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback"/>        

-    </component>     

-    

-    <component name="ConversationalReferenceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>

-    </component>    

-        

-    <component name="ConversationalServiceStateful">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>

-	</component>       

-   

-    <component name="ConversationalServiceStateless">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScopeImpl"/>

-	</component>  

-	

-    <component name="ConversationalServiceStatelessSL">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl"/>

-    </component> 

-

-    <component name="ConversationalServiceRequest">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>

-    </component> 

-    

-    <component name="ConversationalServiceStatefulNonConversationalCallback">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>

-	</component>

-

-    <component name="ConversationalAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.AServiceImpl"/>

-        <reference name="b" target="ConversationalBComponent" />

-    </component>

-

-    <component name="ConversationalBComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.BServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
deleted file mode 100644
index 3e750bdd1e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ /dev/null
@@ -1,54 +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.itest.conversational;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationIdTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("conversationId.composite");
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testConversationId() {
-        ConversationIdService service =
-            domain.getService(ConversationIdService.class, "ConversationIdComponent");
-        Assert.assertNotNull(service.getCIDField());
-        Assert.assertNotNull(service.getCIDSetter());
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
deleted file mode 100644
index 326a833a42..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ /dev/null
@@ -1,203 +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.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationLifetimeTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("conversationLifetime.composite");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * Following a clarification re. the wording of the Java Common Annotations and APIs 1.00 Specification
-     * (see TUSCANY-2055) the following is accepted to be the intended operation
-     * 
-     * Whether the conversation ID is chosen by the user or is generated by the system, the client
-     * may access the conversation ID by calling getConversationID() on the current conversation object.
-     * 
-     * ServiceReference.getConversationID() - Returns the id supplied by the user that will be associated with
-     * future conversations initiated through this reference, or null if no ID has been set by the user.
-     * 
-     * ServiceReference.setConversationID(Object conversationId) - Set an ID, supplied by the user, to associate with any future conversation
-     * started through this reference. If the value supplied is null then the id will be generated
-     * by the implementation. Throws an IllegalStateException if a conversation is currently
-     * associated with this reference. 
-     * 
-     */
-
-    /**
-     * Verify that ServiceReference.getConversationID() returns null before a conversation
-     * ID has been set manually.
-     */
-    @Test
-    public void getConversationID() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Assert.assertNull(service.getConversationID());
-    }
-
-    /**
-     * Verify that ServiceReference.getConversationID() returns any value previous set through the
-     * setConversationID() API.
-     */
-    @Test
-    public void getConversationID2() {
-        String userProvidedID = "A conversation ID";
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID(userProvidedID);
-        service.getState();
-        Assert.assertEquals(service.getConversationID(), userProvidedID);
-    }
-    
-    /**
-     * Whether the conversation ID is chosen by the user or is generated by the system, the client
-     * may access the conversation ID by calling getConversationID() on the current conversation object.
-     * Here test the manually set conversationID
-     */
-    @Test
-    public void getConversationID3() {
-        String userProvidedID = "A conversation ID";
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID(userProvidedID);
-        service.getState();
-        Assert.assertEquals(service.getConversationObjectConversationId(), userProvidedID);
-    }
-    
-    /**
-     * Whether the conversation ID is chosen by the user or is generated by the system, the client
-     * may access the conversation ID by calling getConversationID() on the current conversation object.
-     * Here test the auto generated conversationId
-     */
-    @Test
-    public void getConversationID4() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Assert.assertNotNull(service.getConversationObjectConversationId());
-    }    
-    
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 494-495 Verify:
-     * If a method is invoked on a service reference after an
-     * "@EndsConversation" method has been called then a new conversation will
-     * automatically be started.
-     */
-    @Test
-    public void implicitStartNewConversationAfterEnd() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Object firstID = service.getConversationObjectConversationId();
-        service.endConversationViaAnnotatedMethod();
-        service.getState();
-        Assert.assertNotSame(firstID, service.getConversationObjectConversationId());
-    }
-
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-495 Verify: If a
-     * method is invoked on a service reference after an "@EndsConversation"
-     * method has been called then a new conversation will automatically be
-     * started. Note: Uses Conversation.end() rather than "@EndsConversation"
-     */
-    @Test
-    public void implicitStartNewConversationAfterEnd2() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Object firstID = service.getConversationObjectConversationId();
-        service.endConversation();
-        service.getState();
-        Assert.assertNotSame(firstID, service.getConversationObjectConversationId());
-    }
-
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
-     * If ServiceReference.getConversationID() is called after the
-     * "@EndsConversation" method is called, but before the next conversation
-     * has been started, it will return null.
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        service.endConversationViaAnnotatedMethod();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-    
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
-     * If ServiceReference.getConversationID() is called after the
-     * "@EndsConversation" method is called, but before the next conversation
-     * has been started, it will return null.  Note: Uses explicit set of Conversation ID
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation1a() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID("User provided ID");
-        service.getState();
-        service.endConversationViaAnnotatedMethod();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
-     * ServiceReference.getConversationID() is called after the
-     * "@EndsConversationmethod" is called, but before the next conversation has
-     * been started, it will return null. Note: Uses Conversation.end() rather
-     * than "@EndsConversation"
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation2() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        service.endConversation();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-    
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
-     * ServiceReference.getConversationID() is called after the
-     * "@EndsConversationmethod" is called, but before the next conversation has
-     * been started, it will return null. Note: Uses Conversation.end() rather
-     * than "@EndsConversation".  Note 2: Uses explicit set of Conversation ID
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation2a() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID("User provided ID");
-        service.getState();
-        service.endConversation();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
deleted file mode 100644
index 431962221a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ /dev/null
@@ -1,71 +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.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.TestResult;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationUniqueIdTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("ConversationUniqueId.composite");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testConversationUniqueId() {
-        Alpha alpha = domain.getService(Alpha.class, "Alpha");
-        int numConversations = 3;
-        
-        for(int i = 0; i < numConversations; ++i) {
-            alpha.run(5);
-        }
-        
-        // Wait for the conversations to complete
-        while (TestResult.getCompleted() < numConversations) {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-            }
-        }
-        
-        Assert.assertEquals(TestResult.results.size(), numConversations);
-        for(Boolean value : TestResult.results.values()) {
-            Assert.assertTrue(value);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
deleted file mode 100644
index cc31c77873..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ /dev/null
@@ -1,103 +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.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.ConversationEndedException;
-
-public class ConversationalAgeTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        System.setProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval", "2");        
-        domain = SCADomain.newInstance("ConversationAge.composite");
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        System.clearProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval");        
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testMaxAge() throws InterruptedException {
-
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationAgeComponent");
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-        conversationalService.initializeCount(42);
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Thread.sleep(500);
-        try {
-            Assert.assertEquals(42, conversationalService.retrieveCount());
-        } catch (ConversationEndedException e) {
-            Assert.fail();
-        }
-    }
-
-    @Test
-    public void testAgeExpired() throws InterruptedException {
-
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationAgeComponent");
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-        conversationalService.initializeCount(42);
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Thread.sleep(1100);
-        try {
-            Assert.assertEquals(0, conversationalService.retrieveCount());
-            Assert.fail();
-        } catch (ConversationEndedException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testMaxIdle() throws InterruptedException {
-
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationIdleComponent");
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-        conversationalService.initializeCount(42);
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Thread.sleep(1100);
-        try {
-            Assert.assertEquals(0, conversationalService.retrieveCount());
-        } catch (ConversationEndedException e) {
-            // expected
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
deleted file mode 100644
index 8480e04028..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ /dev/null
@@ -1,84 +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.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationalJ2SETestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("conversational.composite");
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testStatefulConversation() {
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationalServiceStateful");
-
-        conversationalService.initializeCount(1);
-        Assert.assertEquals(1, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(2, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-
-        conversationalService.initializeCount(4);
-        Assert.assertEquals(4, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(5, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-    }
-
-    @Test
-    public void testStatelessConversation() {
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationalServiceStateless");
-
-        conversationalService.initializeCount(1);
-        Assert.assertEquals(1, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(2, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-        conversationalService.initializeCount(4);
-        Assert.assertEquals(4, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(5, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
deleted file mode 100644
index da359bc296..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ /dev/null
@@ -1,649 +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.itest.conversational;

-

-import junit.framework.Assert;

-

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

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class ConversationalTestCase {

-

-    private static SCADomain domain;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-    	try {

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

-	

-	        conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatelessClientStatelessService");

-	

-	        conversationalStatelessClientStatefulService  = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatelessClientStatefulService");

-	

-	        conversationalStatefulClientStatelessService  = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatefulClientStatelessService");

-	

-	        conversationalStatefulClientStatefulService   = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatefulClientStatefulService");

-	        conversationalStatelessClientRequestService    = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatelessClientRequestService");

-	        conversationalStatefulClientNonConversationalCallbackStatelessService    = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-        

-    	} catch(Exception ex) {

-    		System.err.println(ex.toString());

-    	}

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        domain.close();

-    }

-    

-    private void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }

-

-    // stateless client stateful service tests

-    // =======================================

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationFromServiceReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-   

-    @Test

-    public void testStatelessStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }   

-    

-    @Test

-    public void testStatelessStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatelessStatefulConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatelessClientStatefulService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalServiceStatefulImpl.calls.toString());

-    }     

-

-    @Test

-    public void testStatelessStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatelessClientStatefulService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }  

-    

-    //@Test

-    public void testStatelessStatefulConversationHavingPassedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }    

-  

-    @Test

-    public void testStatelessStatefulConversationBusinessException() {

-        String message = conversationalStatelessClientStatefulService.runConversationBusinessException();

-        Assert.assertEquals("Business Exception", message);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationBusinessExceptionCallback() {

-        String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();

-        Assert.assertEquals("Business Exception", message);

-    }  

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }   

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-

-    // stateless client stateless service tests

-    // ========================================

-    @Test

-    public void testStatelessStatelessConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-

-    @Test

-    public void testStatelessStatelessConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationFromServiceReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatelessStatelessConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }  

-    @Test

-    public void testStatelessStatelessConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatelessClientStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-                            ConversationalServiceStatelessImpl.calls.toString());

-    }       

-    

-    @Test

-    public void testStatelessStatelessConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatelessClientStatelessService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }

-    //@Test

-    public void testStatelessStatelessConversationHavingPassedReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }     

-

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    } 

-    

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-

-    // stateful client stateful service tests  

-    // ======================================

-    @Test

-    public void testStatefulStatefulConversationFromInjectedReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatefulStatefulConversationFromServiceReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-    

-    @Test

-    public void testStatefulStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatefulClientStatefulService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalServiceStatefulImpl.calls.toString());

-    }  

-

-    @Test

-    public void testStatefulStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientStatefulService.runConversationWithCallback();

-        Assert.assertEquals(4, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalClientStatefulImpl.calls.toString());        

-    }   

-    

-    //@Test

-    public void testStatefulStatefulConversationHavingPassedReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }    

-   

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

- 

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-   

-    // stateful client stateless service tests  

-    // =======================================

-    @Test

-    public void testStatefulStatelessConversationFromInjectedReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulStatelessConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatelessConversationFromServiceReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatelessConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-

-    @Test

-    public void testStatefulStatelessConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatefulStatelessConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatefulClientStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-                            ConversationalServiceStatelessImpl.calls.toString());

-    } 

-

-    @Test

-    public void testStatefulStatelessConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientStatelessService.runConversationWithCallback();

-        Assert.assertEquals(4, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalClientStatefulImpl.calls.toString());        

-    }     

-    

-    //@Test

-    public void testStatefulStatelessConversationHavingPassedReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }     

-   

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-  

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }  

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }      

-    

-    // stateless client request scope service tests

-    // ============================================

-    @Test

-    public void testStatelessRequestConversationFromInjectedReference() {

-        int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-   

-    @Test

-    public void testStatelessRequestConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2();

-        Assert.assertEquals(1, count);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationFromServiceReference() {

-        int count = conversationalStatelessClientRequestService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-   

-    @Test

-    public void testStatelessRequestConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }   

-    

-    //@Test

-    public void testStatelessRequestConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatelessRequestConversationCheckingScope() {

-        resetCallStack();

-    	ConversationalServiceRequestImpl.calls = new StringBuffer();

-    	conversationalStatelessClientRequestService.runConversationCheckingScope();

-        Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,", 

-        		            ConversationalServiceRequestImpl.calls.toString());

-    }     

-

-    @Test

-    public void testStatelessRequestConversationWithCallback() {

-        resetCallStack();

-    	ConversationalClientStatelessImpl.calls = new StringBuffer();    	

-        int count = conversationalStatelessClientRequestService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }  

-    

-    //@Test

-    public void testStatelessRequestConversationHavingPassedReference() {

-        int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }    

-  

-    @Test

-    public void testStatelessRequestConversationBusinessException() {

-        String message = conversationalStatelessClientRequestService.runConversationBusinessException();

-        Assert.assertEquals("Business Exception", message);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationBusinessExceptionCallback() {

-        String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback();

-        Assert.assertEquals("Business Exception", message);

-    }  

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }  

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-    

-    // stateful client non conversational callback stateful service tests  

-    // ==================================================================

-   

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-      

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-  

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() {

-        resetCallStack();

-    	conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-        		            ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());

-    }  

-

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-        		           ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());        

-    }   

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(0, count);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }    

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals("MyConversation3", id);

-    }    

-

-    private static final String NEW_A_VALUE = "First Instance - TestCode Set state on A";

-    private static final String NEW_B_VALUE = "First Instance - TestCode Set state on B";

-    private static final String SECOND_NEW_A_VALUE = "Second Instance - TestCode Set state on A";

-    private static final String SECOND_NEW_B_VALUE = "Second Instance - TestCode Set state on B";

-    

-    @Test

-    public void testMultipleConversations() {

-        //////////

-        // Tests on first instance

-        //////////

-        System.out.println("========= First instance tests =========");

-        AService aService = domain.getService(AService.class, "ConversationalAComponent");

-        

-        // Make sure initial values are correct

-        Assert.assertEquals(Constants.A_INITIAL_VALUE, aService.getState());

-        Assert.assertEquals(Constants.B_INITIAL_VALUE, aService.getStateOnB());

-

-        // Set some new values

-        aService.setState(NEW_A_VALUE);

-        aService.setStateOnB(NEW_B_VALUE);

-        

-        // Verify the set worked

-        Assert.assertEquals(NEW_A_VALUE, aService.getState());

-        Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());

-

-        

-        //////////

-        // Tests on second instance

-        //////////

-        System.out.println("========= Second instance tests =========");

-

-        // Do another look up

-        AService aService2 = domain.getService(AService.class, "ConversationalAComponent");

-

-        // Make sure initial values are correct on the second instance

-        Assert.assertEquals(Constants.A_INITIAL_VALUE, aService2.getState());

-        Assert.assertEquals(Constants.B_INITIAL_VALUE, aService2.getStateOnB());

-        

-        // Set some new values on the second instance

-        aService2.setState(SECOND_NEW_A_VALUE);

-        aService2.setStateOnB(SECOND_NEW_B_VALUE);

-    

-        // Verify the set worked on the second instance

-        Assert.assertEquals(SECOND_NEW_A_VALUE, aService2.getState());

-        Assert.assertEquals(SECOND_NEW_B_VALUE, aService2.getStateOnB());

-

-        // Verify the values have not been changed on the first instance

-        Assert.assertEquals(NEW_A_VALUE, aService.getState());

-        Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());

-        

-        System.out.println("========= Done instance tests =========");

-    }

-        

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/pom.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/pom.xml
deleted file mode 100644
index 7b87c331d3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/pom.xml
+++ /dev/null
@@ -1,126 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-common</artifactId>
-    <version>1.3</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Databinding Common Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1-incubating</version>
-            <scope>compile</scope>
-        </dependency>        
-        <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/generate/generate.xsd</fileName>
-                                </configuration>                            
-                            </schemaFiles>
-                            <noNotification>true</noNotification>
-                            <noContainment>true</noContainment>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
deleted file mode 100644
index adb546a1ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ /dev/null
@@ -1,181 +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.itest.generate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.tuscany.generate.GenerateFactory;
-import org.apache.tuscany.generate.GenerateType;
-import org.apache.tuscany.generate.InputFileType;
-import org.apache.tuscany.generate.TemplateType;
-import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * Generates test files based on the information in a configuration files (generate.xml)
- * and a set of velocity templates. The process is
- *
- * for each template
- *     for each xsd file
- *         generate SDOs
- *         include the factory into the composite
- *         for each type
- *             add client iface method
- *             add client impl method
- *             add service iface method
- *             add service impl method
- *             add test method
- *             add wsdl type and method
- *
- * @version $Rev$ $Date$
- */
-public class Generate {
-	
-    /**
-     * Does all the hard work of running the velocity templates against the 
-     * the list of types to test. Both the list of templates and the list of 
-     * XSD files is held in the configuration file (generate.xsd) which lives in the
-     * resources/generate directory of the project being generated. 
-     *
-     * @param projectBuildDir the path to the target dir of the project being generated. 
-     */
-    public static void generate(String projectBuildDir) {
-        System.out.println(">> Building project from dir: " + projectBuildDir);
-        FileInputStream fis = null;
-
-        try {
-            // Load the config file into a stream
-            fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
-            // Load the stream into SDO
-            // We are just using SDO as a convenient way to parse the XML config file
-            HelperContext scope       = SDOUtil.createHelperContext();
-            GenerateFactory.INSTANCE.register(scope);
-            XMLDocument xmlDoc        = scope.getXMLHelper().load(fis);
-            GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
-            // Get the file list. This is the list of XSD that is passed into the 
-            // the velocity templates. Each configured file holds a list of types
-            // that the velocity templates expand into appropriate methods and method calls           
-            List fileList = generateType.getInputFile();
-            
-            //Initialise velocity ready to generate the various files
-            Properties p = new Properties();
-            p.setProperty("file.resource.loader.path", projectBuildDir + "/classes/generate");            
-            Velocity.init(p);
-            VelocityContext context = new VelocityContext();
-            context.put("fileList", fileList);
-            
-            List templateList = generateType.getTemplate();
-
-            // For each velocity template in the template list pass in the XSD file list
-            for ( Object item: templateList){
-            	TemplateType template = (TemplateType)item;
-                context.put("template", template);
-            	String tmp = template.getTemplateName();
-            	String filename = projectBuildDir + "/" + template.getTemplateTargetDir() + "/" + tmp.substring(0,tmp.length() - 3);
-            	File f = new File(filename);
-            	// Create folders since the package doesn't exist before the code-gen for the 1st time
-            	f.getParentFile().mkdirs();
-                FileWriter fw = new FileWriter(f);
-            	System.out.println(">> Processing " + template.getTemplateName() + " to " + filename);
-                Velocity.mergeTemplate(template.getTemplateName(), context, fw );
-                fw.flush();
-                fw.close();
-            } 
-
-
-        } catch (Exception e) {
-            System.out.println("Exception : " + e.toString());
-            e.printStackTrace();
-            return;
-        }        
-    }
-    
-    /**
-     * The SDO generator tool does all of the hard work
-     *
-     * @param projectBuildDir the path to the target dir of the project being generated. 
-     */
-    public static void generateSDO(String projectBuildDir) {
-        System.out.println(">> Building SDOs from dir: " + projectBuildDir);
-        FileInputStream fis = null;
-
-        try {
-            // Load the config file into a stream
-            fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
-            // Load the stream into SDO
-            // We are just using SDO as a convenient way to parse the XML config file
-            HelperContext scope       = SDOUtil.createHelperContext();
-            GenerateFactory.INSTANCE.register(scope);
-            XMLDocument xmlDoc        = scope.getXMLHelper().load(fis);
-            GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
-            // Get the file list. This is the list of XSD that is passed into the 
-            // the velocity templates. Each configured file holds a list of types
-            // that the velocity templates expand into appropriate methods and method calls           
-            List fileList = generateType.getInputFile();
-                        
-            // for each XSD in the XSD file list generate an SDO.
-            XSD2JavaGenerator generator = new XSD2JavaGenerator();
-            
-            for ( Object item : fileList){
-                InputFileType file = (InputFileType)item;
-                
-                XSD2JavaGenerator.generateFromXMLSchema(projectBuildDir + "/classes/xsd/" + file.getFileName(), 
-                                                        file.getNamespace(), 
-                                                        projectBuildDir + "/sdo-source", 
-                                                        file.getJavaPackage(), 
-                                                        null, //file.getPrefix(), 
-                                                        XSD2JavaGenerator.OPTION_NO_CONTAINMENT | XSD2JavaGenerator.OPTION_NO_NOTIFICATION | XSD2JavaGenerator.OPTION_NO_UNSETTABLE);
-                             
-            }
-
-        } catch (Exception e) {
-            System.out.println("Exception : " + e.toString());
-            e.printStackTrace();
-            return;
-        }        
-    }    
-
-    /**
-     * The mainline
-     * 
-     * @param args the target directory where project in which files are being generated
-     */
-    public static void main(String[] args) {
-        
-        Generate.generate(args[0]);
-        
-        if (args.length > 1){
-            Generate.generateSDO(args[0]);
-        } 
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
deleted file mode 100644
index b2346aa973..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ /dev/null
@@ -1,112 +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 $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of 
- * bindings and a number of data types. 
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class DatabindingTestCase extends TestCase  {
-
-    private SCADomain domain;
-    private GreeterService greeterClient;
-
-    /**
-     * Runs before each test method
-     */
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("greeter.composite");
-        super.setUp();
-    }
-
-    /**
-     * Runs after each test method
-     */
-    protected void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Finds the SCA component that relates to the protocol being tested. This test 
-     * always connects locally to the client component but the client component will
-     * connect to the back end component using the appropriate protocol
-     *
-     * @param ext the protcol required
-     */
-    private void setUpClient(String ext) throws Exception {
-        greeterClient = domain.getService(GreeterService.class, ext + "GreeterServiceClient");  
-    }
-
-    /**
-     * Invokes the SDO Greet service using web service bindings with SDO payload
-     */
-    public void testWSGreet() throws Exception {
-        setUpClient("WS");
-        greet();
-    }
-
-    /**
-     * Invokes the SDO Greet service using default bindings with SDO payload
-     */
-    public void testDefaultGreet() throws Exception {
-        setUpClient("Default");
-        greet();
-    }
-
-    /**
-     * A generic method which, regarless of which client is connected, sends out a 
-     * series of requrests passing different data types. 
-     */
-    public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-        // test $typeInstance.getTypeName()
-        { 
-            $typeInstance.getTypeName() param = null;
-            $typeInstance.getCreateTypeCode()
-            $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
-            $typeInstance.getResultComparison()
-        }
-#end
-#end            
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
deleted file mode 100644
index 88616cc997..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ /dev/null
@@ -1,103 +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://apache.org/tuscany/sca/itest/databinding/services"
-                  xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Greeter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
-#foreach($file in $fileList)
-            xmlns:$file.getPrefix()="$file.getNamespace()"
-#end        
-            targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services" 
-            elementFormDefault="qualified">
-
-#foreach($file in $fileList)
-            <xsd:import namespace="$file.getNamespace()" 
-                        schemaLocation="../xsd/$file.getFileName()" />            
-#end 
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-            <element name="greet$typeInstance.getTypeName()">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" />
-                    </sequence>
-                </complexType>
-            </element>
-#end
-#end
-        </xsd:schema>
-    </wsdl:types>
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    <wsdl:message name="$typeInstance.getTypeName()Request">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="$typeInstance.getTypeName()Response">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-#end
-#end
-
-    <wsdl:portType name="GreeterPortType">
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" />
-            <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" />
-        </wsdl:operation>
-#end
-#end
-   </wsdl:portType>
-
-    <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="$typeInstance.getTypeName()RequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="$typeInstance.getTypeName()ResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-#end
-#end              
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterService">
-        <wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/GreeterServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
deleted file mode 100644
index 77a12e92ec..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ /dev/null
@@ -1,53 +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 $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The automatically generated interface to the service that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Remotable
-public interface GreeterService {
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-    /**
-     * Take the provided data object, change it slightly and return it
-     * 
-     * @param param the data object to be changed and returned
-     * @return the change data object 
-     */
-    $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end	
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
deleted file mode 100644
index ee73db6152..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ /dev/null
@@ -1,42 +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 $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-/**
- * GreeterServiceClient
- */
-@AllowsPassByReference
-public interface GreeterServiceClient {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-    $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
deleted file mode 100644
index aab564dc1e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ /dev/null
@@ -1,65 +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 $template.getJavaPackage();
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-/**
- * The automatically generated service that simply forwards data objects on to 
- * the GreeterService and passes back the responses
- *
- * @version $Rev: 508831 $ $Date: 2007-02-18 00:12:31 +0000 (Sun, 18 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceClientImpl implements GreeterService {
-
-    /**
-     * the reference the the GreeterService that will
-     * change each data object slightly and return it
-     */
-    private GreeterService service;
-
-    @Reference
-    public void setGreeterService(GreeterService service) {
-        this.service = service;
-    }
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet$typeInstance.getTypeName()($typeInstance.getTypeName() param)
-     */
-    public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
-        return service.greet$typeInstance.getTypeName()(param);
-    }
-#end
-#end    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
deleted file mode 100644
index 5507a0b747..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ /dev/null
@@ -1,55 +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 $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * The automatically generated service implementation that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceImpl implements GreeterService {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    /**
-     * Take the provided data object, change it slightly and return it
-     * 
-     * @param param the data object to be changed and returned
-     * @return the change data object 
-     */
-    public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
-        $typeInstance.getModifyTypeCode()
-        return param;
-    }
-#end
-#end	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/generate.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/generate.xsd
deleted file mode 100644
index 1fabedf55f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/generate" 
-        xmlns:tns="http://www.apache.org/tuscany/generate">
-        
-    <complexType name="TypeType">
-        <sequence>
-            <element name="TypeName" type="string"/>
-            <element name="CreateTypeCode" type="string"/>
-            <element name="ModifyTypeCode" type="string"/>
-            <element name="ResultComparison" type="string"/>
-        </sequence>
-    </complexType>        
-    
-    <complexType name="InputFileType">
-        <sequence>
-            <element name="FileName" type="string"/>
-            <element name="FilePath" type="string"/> 
-            <element name="JavaPackage" type="string"/>
-            <element name="Factory" type="string"/>
-            <element name="Namespace" type="string"/>
-            <element name="Prefix" type="string"/>
-            <element name="Type" type="tns:TypeType" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="TemplateType">
-        <sequence>
-            <element name="TemplateName" type="string"/>
-            <element name="TemplateTargetDir" type="string"/>
-            <element name="JavaPackage" type="string"/>
-        </sequence>
-    </complexType>
-        
-    <complexType name="GenerateType">
-        <sequence>
-            <element name="Template" type="tns:TemplateType" maxOccurs="unbounded"/>
-            <element name="InputFile" type="tns:InputFileType" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <element name="Generate" type="tns:GenerateType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
deleted file mode 100644
index 8927d725b6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-A dummy file that causes the target/classes/wsdl dir to be created in the generated test project. This is 
-required because the test generator must run in the process-resource phase, after generate.xml has been copied
-into target. The generator needs to write out target/classes/wsdl and will fail the directory isn't there. So
-this file just gets unpacked and forces the directory to be created. 
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Annotation.xml
deleted file mode 100644
index f1f4346e58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Annotation xmlns:tns="http://www.apache.org/tuscany/interop"
-	            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	            xsi:schemaLocation="http://www.apache.org/tuscany/interop Annotation.xsd">
-	<SimpleTypeWithNameElement>SimpleTypeWithName</SimpleTypeWithNameElement>
-</tns:Annotation>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
deleted file mode 100644
index 1fae43eb09..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <annotation>
-    <appinfo>SDO 2.0.1</appinfo>
-    <documentation>
-        A schema that tests the presence of annotations in schema read by SDO
-    </documentation>
-  </annotation>
-           
-  <complexType name="AnnotationComplexType">
-    <sequence>
-      <element name="SimpleTypeWithNameElement" type="string"/>
-    </sequence>
-  </complexType>  
-                 
-  <element name="Annotation" type="tns:AnnotationComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Attribute.xml
deleted file mode 100644
index c20c80b658..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Attribute xmlns:tns="http://www.apache.org/tuscany/interop" 
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-               xsi:schemaLocation="http://www.apache.org/tuscany/interop Attribute.xsd ">
-  <AttributeElement Attribute="Attribute"/>
-</tns:Attribute>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
deleted file mode 100644
index bd3db2e030..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-            
-  <complexType name="AttributeType">
-    <sequence>
-    </sequence> 
-    <attribute name="Attribute" type="string"/>
-  </complexType> 
-                 
-  <complexType name="AttributeComplexType">
-    <sequence>
-       <element name="AttributeElement" type="tns:AttributeType"/>
-    </sequence>
-  </complexType>
-  
-  <element name="Attribute" type="tns:AttributeComplexType"/>
- 
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
deleted file mode 100644
index 30e4979dca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeReference xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeReference.xsd ">
-  <AttributeReferenceElement tns:ReferencedAttribute="AttributeReference"/>
-</tns:AttributeReference>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
deleted file mode 100644
index e7738dcff7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <attribute name="ReferencedAttribute" type="string"/>    
-   
-  <complexType name="AttributeReferenceComplexType">
-    <sequence>
-    </sequence> 
-    <attribute ref="tns:ReferencedAttribute"/>   
-  </complexType> 
-                 
-  <element name="AttributeReference">
-    <complexType>
-      <sequence>
-        <element name="AttributeReferenceElement" type="tns:AttributeReferenceComplexType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
deleted file mode 100644
index 9552421e2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithDefaultValueElement xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                      xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithDefaultValue.xsd ">
-  <AttributeWithDefaultValueElement AttributeWithDefaultValue="AttributeWithDefaultValueDefaultValue"/>
-</tns:AttributeWithDefaultValueElement>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
deleted file mode 100644
index c7b9655749..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithDefaultValueType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithDefaultValue" type="string" default="AttributeWithDefaultValueDefaultValue"/>
-  </complexType> 
-                 
-  <element name="AttributeWithDefaultValueElement">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithDefaultValueElement" type="tns:AttributeWithDefaultValueType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
deleted file mode 100644
index 5e5e7fbd55..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithFixedValueType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                 xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithFixedValue.xsd ">
-  <AttributeWithFixedValueElement AttributeWithFixedValue="AttributeWithFixedValueFixedValue"/>
-</tns:AttributeWithFixedValueType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
deleted file mode 100644
index 5c455c2ab5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithFixedValueType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithFixedValue" type="string" fixed="AttributeWithFixedValueFixedValue"/> 
-  </complexType> 
-                 
-  <element name="AttributeWithFixedValueType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithFixedValueElement" type="tns:AttributeWithFixedValueType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
deleted file mode 100644
index 635e851632..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOAliasName.xsd ">
-  <AttributeWithSDOAliasNameElement AttributeWithSDOAliasName="AttributeWithSDOAliasName"/>
-</tns:AttributeWithSDOAliasName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
deleted file mode 100644
index 004dab4fbb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithSDOAliasNameType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOAliasName" sdo:aliasName="AttributeWithSDOAliasNameSDOAliasName" type="string"/>
-  </complexType> 
-                 
-  <element name="AttributeWithSDOAliasName">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOAliasNameElement" type="tns:AttributeWithSDOAliasNameType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
deleted file mode 100644
index 136092951b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDODataType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                              xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDODataType.xsd ">
-  <AttributeWithSDODataTypeTypeElement AttributeWithSDODataType="AttributeWithSDODataType"/>
-</tns:AttributeWithSDODataType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
deleted file mode 100644
index 796f08e1cf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithSDODataTypeType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDODataType" sdo:dataType="string" type="string"/>
-  </complexType> 
-                 
-  <element name="AttributeWithSDODataType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDODataTypeTypeElement" type="tns:AttributeWithSDODataTypeType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
deleted file mode 100644
index 927b94885c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOName.xsd ">
-  <AttributeWithSDONameElement AttributeWithSDOName="AttributeWithSDOName"/>
-</tns:AttributeWithSDOName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
deleted file mode 100644
index 93f83cd0a1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithSDONameType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOName" sdo:name="AttributeWithSDONameSDOName" type="string"/>
- </complexType> 
-                 
-  <element name="AttributeWithSDOName">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDONameElement" type="tns:AttributeWithSDONameType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
deleted file mode 100644
index ea7db70595..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOPropertySDOOppositePropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOPropertySDOOppositePropertyType.xsd ">
-  <AttributeWithSDOPropertySDOOppositePropertyTypeElement AttributeWithSDOPropertySDOOppositePropertyType="idvalue0"/>
-</tns:AttributeWithSDOPropertySDOOppositePropertyType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
deleted file mode 100644
index c64323e7e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithSDOPropertySDOOppositePropertyTypeType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOPropertySDOOppositePropertyType" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType" sdo:oppositeProperty="tns:AttributeWithSDOPropertyType"/>     
-  </complexType> 
-                 
-  <element name="AttributeWithSDOPropertySDOOppositePropertyType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOPropertySDOOppositePropertyTypeElement" type="tns:AttributeWithSDOPropertySDOOppositePropertyTypeType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
deleted file mode 100644
index 85c7d85fd4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOPropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                  xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOPropertyType.xsd ">
-  <AttributeWithSDOPropertyTypeElement AttributeWithSDOPropertyType="idvalue0"/>
-</tns:AttributeWithSDOPropertyType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
deleted file mode 100644
index 543f276c50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithSDOPropertyTypeType">
-    <sequence>
-    </sequence>   
-    <attribute name="AttributeWithSDOPropertyType" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType"/> 
-  </complexType> 
-                 
-  <element name="AttributeWithSDOPropertyType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOPropertyTypeElement" type="tns:AttributeWithSDOPropertyTypeType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
deleted file mode 100644
index fcd281539b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOString.xsd ">
-  <AttributeWithSDOStringElement AttributeWithSDOString="AttributeWithSDOString"/>
-</tns:AttributeWithSDOString>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
deleted file mode 100644
index 1610c2b861..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithSDOStringType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOString" type="string" sdo:string="true"/>     
-  </complexType> 
-                 
-  <element name="AttributeWithSDOString">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOStringElement" type="tns:AttributeWithSDOStringType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
deleted file mode 100644
index 36a0760a61..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInAnySimpleType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnySimpleType.xsd ">
-  <anySimpleType>anySimpleType</anySimpleType>
-</tns:BuiltInAnySimpleType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
deleted file mode 100644
index 999b72bb35..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuiltInAnySimpleType">
-    <complexType>
-      <sequence>
-        <element name="anySimpleType" type="anySimpleType" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
deleted file mode 100644
index 5849165fe0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInAnyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnyType.xsd ">
-  <anyType xsi:type="anyType"/>
-</tns:BuiltInAnyType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
deleted file mode 100644
index 71dad561ca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuiltInAnyType">
-    <complexType>
-      <sequence>
-        <element name="anyType" type="anyType" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
deleted file mode 100644
index 8acf9376d7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInAnyURI xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnyURI.xsd ">
-  <anyURI>http://tempuri.org</anyURI>
-</tns:BuiltInAnyURI>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
deleted file mode 100644
index a49987c352..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-                
-  <element name="BuiltInAnyURI">
-    <complexType>
-      <sequence>
-        <element name="anyURI" type="anyURI" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
deleted file mode 100644
index a35b6e174a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuildInBase64Binary xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInBase64Binary.xsd ">
-  <base64Binary>ABCDEF</base64Binary>
-</tns:BuildInBase64Binary>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
deleted file mode 100644
index e1995890f9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuildInBase64Binary">
-    <complexType>
-      <sequence>
-        <element name="base64Binary" type="base64Binary" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
deleted file mode 100644
index 91cfce51b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:BuiltInBoolean xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInBoolean.xsd ">
-  <boolean>true</boolean>
-  <boolean>false</boolean>
-  <boolean>1</boolean>
-  <boolean>0</boolean>
-</tns:BuiltInBoolean>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
deleted file mode 100644
index a2f86ba8c5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-               
-  <element name="BuiltInBoolean">
-    <complexType>
-      <sequence>
-        <element name="boolean" type="boolean" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
deleted file mode 100644
index 907474cd1b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInByte.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.
--->
-<tns:BuiltInByte xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInByte.xsd ">
-	<byte>127</byte>
-	<byte>-127</byte>
-</tns:BuiltInByte>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
deleted file mode 100644
index a2f6bcfa77..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-                
-  <element name="BuiltInByte">
-    <complexType>
-      <sequence>
-        <element name="byte" type="byte" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
deleted file mode 100644
index c5820e1a2e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInDate xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDate.xsd ">
-  <date>2001-01-01</date>
-</tns:BuiltInDate>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
deleted file mode 100644
index f4d596bfe3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuiltInDate">
-    <complexType>
-      <sequence>
-        <element name="date" type="date" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
deleted file mode 100644
index 0debe2fec5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInDateTime xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDateTime.xsd ">
-  <dateTime>2001-12-31T12:00:00</dateTime>
-</tns:BuiltInDateTime>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
deleted file mode 100644
index b5bcfdcfd4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-                
-  <element name="BuiltInDateTime">
-    <complexType>
-      <sequence>
-        <element name="dateTime" type="dateTime" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
deleted file mode 100644
index 7f001254cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.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.
--->
-<tns:BuiltInDecimal xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDecimal.xsd ">
-	<decimal>-1.23456789</decimal>
-	<decimal>1.23456789</decimal>
-</tns:BuiltInDecimal>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
deleted file mode 100644
index 8d4d106f59..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInDecimal">
-    <complexType>
-      <sequence>
-        <element name="decimal" type="decimal" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
deleted file mode 100644
index f875b9f94d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.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.
--->
-<tns:BuiltInDouble xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDouble.xsd ">
-	<double>0.0</double>
-	<double>12.3E-4</double>
-</tns:BuiltInDouble>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
deleted file mode 100644
index 4c8a39b06c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInDouble">
-    <complexType>
-      <sequence>
-        <element name="double" type="double" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
deleted file mode 100644
index 7d343d6dda..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInDuration xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDuration.xsd ">
-  <duration>P1D</duration>
-</tns:BuiltInDuration>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
deleted file mode 100644
index bb12bc04a9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-          
-  <element name="BuiltInDuration">
-    <complexType>
-      <sequence>
-        <element name="duration" type="duration" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
deleted file mode 100644
index 7a81f3b0dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInFloat xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInFloat.xsd ">
-  <float>0.0</float>
-</tns:BuiltInFloat>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
deleted file mode 100644
index f0e1c21233..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInFloat">
-    <complexType>
-      <sequence>
-        <element name="float" type="float" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
deleted file mode 100644
index d35568b3c9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGDay xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGDay.xsd ">
-  <gDay>---01</gDay>
-</tns:BuiltInGDay>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
deleted file mode 100644
index 92bd9a4b66..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
- 
-  <element name="BuiltInGDay">
-    <complexType>
-      <sequence>
-        <element name="gDay" type="gDay" maxOccurs="unbounded"/>
-       </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
deleted file mode 100644
index 52cdfa8c4e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGMonth xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGMonth.xsd ">
-  <gMonth>--01--</gMonth>
-</tns:BuiltInGMonth>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
deleted file mode 100644
index 78d001a585..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInGMonth">
-    <complexType>
-      <sequence>
-        <element name="gMonth" type="gMonth" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
deleted file mode 100644
index 2609a858f7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGMonthDay xmlns:tns="http://www.apache.org/tuscany/interop" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                      xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGMonthDay.xsd ">
-  <gMonthDay>--01-01</gMonthDay>
-</tns:BuiltInGMonthDay>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
deleted file mode 100644
index 38f6c55059..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-               
-  <element name="BuiltInGMonthDay">
-    <complexType>
-      <sequence>
-        <element name="gMonthDay" type="gMonthDay" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
deleted file mode 100644
index 7868a47ca3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGYear xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGYear.xsd ">
-  <gYear>2001</gYear>
-</tns:BuiltInGYear>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
deleted file mode 100644
index 0d65b124ff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInGYear">
-    <complexType>
-      <sequence>
-        <element name="gYear" type="gYear" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
deleted file mode 100644
index 3f5080d49f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGYearMonth xmlns:tns="http://www.apache.org/tuscany/interop"    
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                       xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGYearMonth.xsd ">
-  <gYearMonth>2001-01</gYearMonth>
-</tns:BuiltInGYearMonth>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
deleted file mode 100644
index 340555dc5f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInGYearMonth">
-    <complexType>
-      <sequence>
-        <element name="gYearMonth" type="gYearMonth" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
deleted file mode 100644
index 0deb7af980..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInHexBinary xmlns:tns="http://www.apache.org/tuscany/interop" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                      xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInHexBinary.xsd ">
-  <hexBinary>0F00</hexBinary>
-</tns:BuiltInHexBinary>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
deleted file mode 100644
index 8059fe6da0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInHexBinary">
-    <complexType>
-      <sequence>
-        <element name="hexBinary" type="hexBinary" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
deleted file mode 100644
index 06c92ce19b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInID xmlns:tns="http://www.apache.org/tuscany/interop" 
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-               xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInID.xsd ">
-  <ID>idvalue0</ID>
-</tns:BuiltInID>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
deleted file mode 100644
index 7b1f02d1d4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInID">
-    <complexType>
-      <sequence>
-        <element name="ID" type="ID" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
deleted file mode 100644
index 9bc0cefd0f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ /dev/null
@@ -1,24 +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.
--->           
-<tns:BuiltInIDREF xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInIDREF.xsd ">
-  <IDREF>idvalue0</IDREF>
-</tns:BuiltInIDREF>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
deleted file mode 100644
index 0c207983bc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInIDREF">
-    <complexType>
-      <sequence>
-        <element name="IDREF" type="IDREF" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
deleted file mode 100644
index f91b602f99..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInIDREFS xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInIDREFS.xsd ">
-  <IDREFS>idvalue0</IDREFS>
-</tns:BuiltInIDREFS>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
deleted file mode 100644
index b99bf01b73..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInIDREFS">
-    <complexType>
-      <sequence>
-        <element name="IDREFS" type="IDREFS" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
deleted file mode 100644
index c99698e175..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInt.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.
--->
-<tns:BuiltInInt xmlns:tns="http://www.apache.org/tuscany/interop" 
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInInt.xsd ">
-    <int>-2147483648</int>
-	<int>2147483647</int>
-</tns:BuiltInInt>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
deleted file mode 100644
index b5b9b0d1eb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-       
-  <element name="BuiltInInt">
-    <complexType>
-      <sequence>
-        <element name="int" type="int" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
deleted file mode 100644
index 80d22ce057..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.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.
--->
-<tns:BuiltInInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInInteger.xsd ">
-	<integer>-2147483648</integer>
-	<integer>2147483647</integer>
-</tns:BuiltInInteger>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
deleted file mode 100644
index 4902935db5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-  
-  <element name="BuiltInInteger">
-    <complexType>
-      <sequence>
-        <element name="integer" type="integer" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
deleted file mode 100644
index 664bf824b4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInLanguage xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInLanguage.xsd ">
-  <language>EN</language>
-</tns:BuiltInLanguage>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
deleted file mode 100644
index 5d3658d224..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-    
-  <element name="BuiltInLanguage">
-    <complexType>
-      <sequence>
-        <element name="language" type="language" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
deleted file mode 100644
index c5861fa92a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLong.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.
--->
-<tns:BuiltInLong xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInLong.xsd ">
-	<long>-9223372036854775808</long>
-    <long>9223372036854775807</long>
-</tns:BuiltInLong>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
deleted file mode 100644
index 0aa4710057..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-<notation name="interop50" public="commonj.sdo"/>
-                
-  <element name="BuiltInLong">
-    <complexType>
-      <sequence>
-        <element name="long" type="long" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
deleted file mode 100644
index 1f95950394..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNCName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNCName.xsd ">
-  <NCName>NCName</NCName>
-</tns:BuiltInNCName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
deleted file mode 100644
index 6ee9c435db..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNCName">
-    <complexType>
-      <sequence>
-        <element name="NCName" type="NCName" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
deleted file mode 100644
index 0297f1aeb4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuildInNMTOKEN xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNMTOKEN.xsd ">
-  <NMTOKEN>NMTOKEN</NMTOKEN>
-</tns:BuildInNMTOKEN>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
deleted file mode 100644
index 56d027bdbb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuildInNMTOKEN">
-    <complexType>
-      <sequence>
-        <element name="NMTOKEN" type="NMTOKEN" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
deleted file mode 100644
index 81ba1069bd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNMTOKENS xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNMTOKENS.xsd ">
-  <NMTOKENS>NMTOKENS</NMTOKENS>
-</tns:BuiltInNMTOKENS>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
deleted file mode 100644
index 866ab73024..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNMTOKENS">
-    <complexType>
-      <sequence>
-        <element name="NMTOKENS" type="NMTOKENS" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
deleted file mode 100644
index 8bb3a08b94..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNOTATION xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNOTATION.xsd ">
-  <NOTATION>tns:BuiltInNotationNotation</NOTATION>
-</tns:BuiltInNOTATION>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
deleted file mode 100644
index c7c62f812b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <notation name="BuiltInNotationNotation" public="http://cwiki.apache.org/confluence/display/TUSCANY/Home"/>
-                
-  <element name="BuiltInNOTATION">
-    <complexType>
-      <sequence>
-        <element name="NOTATION"  maxOccurs="unbounded">
-          <simpleType >
-            <restriction base="NOTATION">
-              <enumeration value="tns:BuiltInNotationNotation"/>
-            </restriction>
-          </simpleType>
-        </element>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
deleted file mode 100644
index 8235718c5e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInName.xsd ">
-  <Name>Name</Name>
-</tns:BuiltInName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
deleted file mode 100644
index 36caba2f16..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-             
-  <element name="BuiltInName">
-    <complexType>
-      <sequence>
-        <element name="Name" type="Name" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
deleted file mode 100644
index 599c428a44..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNegativeInteger xmlns:tns="http://www.apache.org/tuscany/interop"  
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNegativeInteger.xsd ">
-  <negativeInteger>-1</negativeInteger>
-</tns:BuiltInNegativeInteger>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
deleted file mode 100644
index 389d5a99f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNegativeInteger">
-    <complexType>
-      <sequence>
-        <element name="negativeInteger" type="negativeInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
deleted file mode 100644
index 919c4a20ee..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNonNegativeInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNonNegativeInteger.xsd ">
-  <nonNegativeInteger>0</nonNegativeInteger>
-</tns:BuiltInNonNegativeInteger>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
deleted file mode 100644
index 59887078b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-        
-  <element name="BuiltInNonNegativeInteger">
-    <complexType>
-      <sequence>
-        <element name="nonNegativeInteger" type="nonNegativeInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
deleted file mode 100644
index 79011f26ab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNonPositiveInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNonPositiveInteger.xsd ">
-  <nonPositiveInteger>-1</nonPositiveInteger>
-</tns:BuiltInNonPositiveInteger>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
deleted file mode 100644
index 5de7d64d7b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNonPositiveInteger">
-    <complexType>
-      <sequence>
-        <element name="nonPositiveInteger" type="nonPositiveInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
deleted file mode 100644
index c40be9e18b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNormalizedString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                             xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNormalizedString.xsd ">
-  <normalizedString>normalizedString</normalizedString>
-</tns:BuiltInNormalizedString>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
deleted file mode 100644
index d4a78787b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNormalizedString">
-    <complexType>
-      <sequence>
-        <element name="normalizedString" type="normalizedString" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
deleted file mode 100644
index c30434de66..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInPositiveInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInPositiveInteger.xsd ">
-  <positiveInteger>1</positiveInteger>
-</tns:BuiltInPositiveInteger>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
deleted file mode 100644
index 5381590cd1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInPositiveInteger">
-    <complexType>
-      <sequence>
-        <element name="positiveInteger" type="positiveInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
deleted file mode 100644
index 4cd6ea7e72..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInQName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInQName.xsd ">
-  <QName>QName</QName>
-</tns:BuiltInQName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
deleted file mode 100644
index e8faf6225b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInQName">
-    <complexType>
-      <sequence>
-        <element name="QName" type="QName" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
deleted file mode 100644
index b4375467c4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInShort.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.
--->
-<tns:BuiltInShort xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInShort.xsd ">
-	<short>-32768</short>
-	<short>32767</short>
-</tns:BuiltInShort>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
deleted file mode 100644
index a4f564d9b7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInShort">
-    <complexType>
-      <sequence>
-        <element name="short" type="short" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
deleted file mode 100644
index d30ab85530..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInString.xsd ">
-  <string>string</string>
-</tns:BuiltInString>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
deleted file mode 100644
index 8abb34b5a5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInString">
-    <complexType>
-      <sequence>
-        <element name="string" type="string" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
deleted file mode 100644
index 7fd9a061ae..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInTime xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInTime.xsd ">
-  <time>12:00:00</time>
-</tns:BuiltInTime>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
deleted file mode 100644
index 1615976813..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInTime">
-    <complexType>
-      <sequence>
-        <element name="time" type="time" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
deleted file mode 100644
index cd567ba528..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInToken xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInToken.xsd ">
-  <token>token</token>
-</tns:BuiltInToken>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
deleted file mode 100644
index 0beaac571f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInToken">
-    <complexType>
-      <sequence>
-        <element name="token" type="token" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
deleted file mode 100644
index 025362defb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.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.
--->
-<tns:BuiltInUnsignedByte xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedByte.xsd ">
-	<unsignedByte>0</unsignedByte>
-	<unsignedByte>255</unsignedByte>
-</tns:BuiltInUnsignedByte>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
deleted file mode 100644
index d6d951fe5d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedByte">
-    <complexType>
-      <sequence>
-        <element name="unsignedByte" type="unsignedByte" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
deleted file mode 100644
index 5736a8c121..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.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.
--->
-<tns:BuiltInUnsignedInt xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedInt.xsd ">
-	<unsignedInt>0</unsignedInt>
-	<unsignedInt>4294967295</unsignedInt>
-</tns:BuiltInUnsignedInt>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
deleted file mode 100644
index 242be1d53b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedInt">
-    <complexType>
-      <sequence>
-        <element name="unsignedInt" type="unsignedInt" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
deleted file mode 100644
index d728115a77..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.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.
--->
-<tns:BuiltInUnsignedLong xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedLong.xsd ">
-	<unsignedLong>0</unsignedLong>
-	<unsignedLong>18446744073709551615</unsignedLong>
-</tns:BuiltInUnsignedLong>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
deleted file mode 100644
index 108e3a8619..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedLong">
-    <complexType>
-      <sequence>
-        <element name="unsignedLong" type="unsignedLong" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
deleted file mode 100644
index d4ffae5e17..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.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.
--->
-<tns:BuiltInUnsignedShort xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedShort.xsd ">
-	<unsignedShort>0</unsignedShort>
-    <unsignedShort>65535</unsignedShort>
-</tns:BuiltInUnsignedShort>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
deleted file mode 100644
index 5ee5e0229e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedShort">
-    <complexType>
-      <sequence>
-        <element name="unsignedShort" type="unsignedShort" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
deleted file mode 100644
index 3d5aed5aa8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeComplexContentRestrictingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeComplexContentRestrictingComplexType.xsd ">
-  <ComplexTypeComplexContentRestrictingComplexTypeElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeComplexContentRestrictingComplexTypeElement>
-</tns:ComplexTypeComplexContentRestrictingComplexType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
deleted file mode 100644
index e7b80ab11c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-   <include schemaLocation="ComplexTypeExtendingComplexType.xsd"/> 
-              
-  <complexType name="ComplexTypeComplexContentRestrictingComplexTypeType">
-    <complexContent>
-      <restriction base="tns:ComplexTypeExtendingComplexTypeType">
-        <sequence>
-          <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>        
-        </sequence>  
-      </restriction>
-    </complexContent>  
-  </complexType>   
-                 
-  <element name="ComplexTypeComplexContentRestrictingComplexType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeComplexContentRestrictingComplexTypeElement" type="tns:ComplexTypeComplexContentRestrictingComplexTypeType"/>                  
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
deleted file mode 100644
index 2b4fe5594e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:ComplexTypeExtendingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeExtendingComplexType.xsd ">
-  <ComplexTypeExtendingComplexTypeElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-    <SimpleTypeWithNameExtended>SimpleTypeWithNameExtended</SimpleTypeWithNameExtended>
-  </ComplexTypeExtendingComplexTypeElement>
-</tns:ComplexTypeExtendingComplexType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
deleted file mode 100644
index fc4deb63c2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="ComplexTypeWithContent.xsd"/>
-              
-  <complexType name="ComplexTypeExtendingComplexTypeType">
-    <complexContent>
-      <extension base="tns:ComplexTypeWithContentType">
-        <sequence>
-          <element name="SimpleTypeWithNameExtended" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>  
-  </complexType> 
-                 
-  <element name="ComplexTypeExtendingComplexType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeExtendingComplexTypeElement" type="tns:ComplexTypeExtendingComplexTypeType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
deleted file mode 100644
index 03570f41d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeExtendingSimpeType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                   xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeExtendingSimpleType.xsd ">
-  <ComplexTypeExtendingSimpeTypeElement AddedByExtension="">ComplexTypeExtendingSimpeTypeElement</ComplexTypeExtendingSimpeTypeElement>
-</tns:ComplexTypeExtendingSimpeType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
deleted file mode 100644
index c754502645..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-              
-  <complexType name="ComplexTypeExtendingSimpleTypeType">
-    <simpleContent>
-      <extension base="tns:SimpleTypeWithNameType">
-		<attribute name="AddedByExtension" type="string"/>
-      </extension>
-    </simpleContent>  
-  </complexType>
-                 
-  <element name="ComplexTypeExtendingSimpeType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeExtendingSimpeTypeElement" type="tns:ComplexTypeExtendingSimpleTypeType"/>            
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
deleted file mode 100644
index 4603793bfc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeSimpleContentRestrictingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                    xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeSimpleContentRestrictingComplexType.xsd ">
-  <ComplexTypeSimpleContentRestrictingComplexTypeElement AddedByExtension="NCName">ComplexTypeSimpleContentRestrictingComplexTypeElement</ComplexTypeSimpleContentRestrictingComplexTypeElement>
-</tns:ComplexTypeSimpleContentRestrictingComplexType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
deleted file mode 100644
index 4bcd2f8c46..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-   <include schemaLocation="ComplexTypeExtendingSimpleType.xsd"/> 
-              
-  <complexType name="ComplexTypeSimpleContentRestrictingComplexTypeType">
-    <simpleContent>
-      <restriction base="tns:ComplexTypeExtendingSimpleTypeType">
-        <attribute name="AddedByExtension" type="NCName" />
-      </restriction>
-    </simpleContent>  
-  </complexType>     
-                 
-  <element name="ComplexTypeSimpleContentRestrictingComplexType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeSimpleContentRestrictingComplexTypeElement" type="tns:ComplexTypeSimpleContentRestrictingComplexTypeType"/>                        
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
deleted file mode 100644
index a6861f803a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:ComplexTypeWithAbstract xmlns:tns="http://www.apache.org/tuscany/interop" 
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                             xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithAbstract.xsd ">
-  <ComplexTypeWithAbstractExtensionElement>
-    <BaseElement>BaseElement</BaseElement>
-    <ExtensionElement>ExtensionElement</ExtensionElement>
-  </ComplexTypeWithAbstractExtensionElement>
-</tns:ComplexTypeWithAbstract>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
deleted file mode 100644
index 8bb251cab2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ /dev/null
@@ -1,47 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <complexType name="ComplexTypeWithAbstractType" abstract="true">
-    <sequence>
-      <element name="BaseElement" type="string"/>
-    </sequence>
-  </complexType>
-  
-  <complexType name="ComplexTypeWithAbstractExtensionType">
-    <complexContent>
-      <extension base="tns:ComplexTypeWithAbstractType">
-        <sequence>
-          <element name="ExtensionElement" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-                 
-  <element name="ComplexTypeWithAbstract">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithAbstractExtensionElement" type="tns:ComplexTypeWithAbstractExtensionType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
deleted file mode 100644
index 467ec007ed..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.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.
--->
-<tns:ComplexTypeWithCDATA xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithCDATA.xsd ">
-  <ComplexTypeWithCDATAElement>
-     Some
-     <![CDATA[some data and some <MoreXML></MoreXML>]]>
-     Mixed 
-    <SimpleTypeWithName>SimpleType<![CDATA[some data and some <MoreXML></MoreXML>]]>WithName</SimpleTypeWithName>
-     Content
-  </ComplexTypeWithCDATAElement>
-</tns:ComplexTypeWithCDATA>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
deleted file mode 100644
index 8d00646678..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/> 
-              
-  <complexType name="ComplexTypeWithCDATAType" mixed="true">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithCDATA">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithCDATAElement" type="tns:ComplexTypeWithCDATAType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
deleted file mode 100644
index 7deafd798a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithContent xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithContent.xsd ">
-  <ComplexTypeWithContentElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithContentElement>
-</tns:ComplexTypeWithContent>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
deleted file mode 100644
index 72ac75fee0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <complexType name="ComplexTypeWithContentType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>
-                 
-  <element name="ComplexTypeWithContent">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithContentElement" type="tns:ComplexTypeWithContentType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
deleted file mode 100644
index f6208f81b3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ /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.
--->
-<tns:ComplexTypeWithMixed xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithMixed.xsd ">
-  <ComplexTypeWithMixedElement>
-    Some 
-	Mixed
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-    Content
-  </ComplexTypeWithMixedElement>
-</tns:ComplexTypeWithMixed>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
deleted file mode 100644
index 1f26e13673..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/> 
-              
-  <complexType name="ComplexTypeWithMixedType" mixed="true">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithMixed">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithMixedElement" type="tns:ComplexTypeWithMixedType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
deleted file mode 100644
index 97de7b98eb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeWithOpenAttributes xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOpenAttributes.xsd ">
-  <ComplexTypeWithOpenAttributesElement SomeOpenAttribute="Some Open Attribute">
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithOpenAttributesElement>
-</tns:ComplexTypeWithOpenAttributes>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
deleted file mode 100644
index 67716553d8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-  
-  <attribute name="SomeOpenAttribute" type="string"/>
-                     
-  <complexType name="ComplexTypeWithOpenAttributesType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-    <anyAttribute namespace="##any"/>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithOpenAttributes">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithOpenAttributesElement" type="tns:ComplexTypeWithOpenAttributesType"/>   
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
deleted file mode 100644
index 5941348921..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.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.
--->
-<tns:ComplexTypeWithOpenContent xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOpenContent.xsd ">
-  <ComplexTypeWithOpenContentElement>
-    <tns:ComplexTypeWithMixed>
-      <ComplexTypeWithMixedElement>
-        Some
-        Mixed
-        <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-        Content
-      </ComplexTypeWithMixedElement>
-    </tns:ComplexTypeWithMixed>
-  </ComplexTypeWithOpenContentElement>
-</tns:ComplexTypeWithOpenContent>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
deleted file mode 100644
index 24d5d09054..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-  
-  <include schemaLocation="ComplexTypeWithMixed.xsd"/>
-                   
-  <complexType name="ComplexTypeWithOpenContentType">
-    <sequence>
-      <any namespace="##any"/>
-    </sequence>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithOpenContent">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithOpenContentElement" type="tns:ComplexTypeWithOpenContentType"/> 
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
deleted file mode 100644
index f684d06a4d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.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.
--->
-<tns:ComplexTypeWithOppositeProperty xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOppositeProperty.xsd ">
-  <ComplexTypeReferencedDataObject DataObjectId="idvalue0">
-    <SomeData>SomeData</SomeData>
-  </ComplexTypeReferencedDataObject>
-  <ComplexTypeReferencingDataObject AttributeWithSDOPropertyType="idvalue0" DataObjectId="idvalue1">
-    <OppositeProperty>idvalue2</OppositeProperty>
-  </ComplexTypeReferencingDataObject>
-  <ComplexTypeWithOppositePropertyElement AttributeWithSDOPropertyType="idvalue1" DataObjectId="idvalue2"/>
-</tns:ComplexTypeWithOppositeProperty>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
deleted file mode 100644
index de4a8a666d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="ComplexTypeReferencedDataObjectType">
-    <sequence>
-      <element name="SomeData" type="string"/>
-    </sequence>
-    <attribute name="DataObjectId" type="ID"/>
-  </complexType>
-    
-  <complexType name="ComplexTypeReferencingDataObjectType">
-    <sequence>
-      <element name="OppositeProperty" type="IDREF"/>
-    </sequence> 
-    <attribute name="AttributeWithSDOPropertyType" type="IDREF" 
-               sdo:propertyType="tns:ComplexTypeReferencedDataObjectType"/> 
-    <attribute name="DataObjectId" type="ID"/>
-  </complexType>     
-    
-  <complexType name="ComplexTypeWithOppositePropertyType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOPropertyType" type="IDREF" 
-               sdo:propertyType="tns:ComplexTypeReferencingDataObjectType"
-               sdo:oppositeProperty="OppositeProperty"/>
-    <attribute name="DataObjectId" type="ID"/> 
-  </complexType>   
-                 
-  <element name="ComplexTypeWithOppositeProperty">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeReferencedDataObject" type="tns:ComplexTypeReferencedDataObjectType"/>
-        <element name="ComplexTypeReferencingDataObject" type="tns:ComplexTypeReferencingDataObjectType"/>
-        <element name="ComplexTypeWithOppositePropertyElement" type="tns:ComplexTypeWithOppositePropertyType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
deleted file mode 100644
index 242908bd27..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                 xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOAliasName.xsd ">
-  <ComplexTypeWithSDOAliasNameElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithSDOAliasNameElement>
-</tns:ComplexTypeWithSDOAliasName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
deleted file mode 100644
index 4c00fbe295..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">    
-        
-  <complexType name="ComplexTypeWithSDOAliasNameType" sdo:aliasName="ComplexTypeWithSDOAliasNameTypeSDOAliasName">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>  
-                 
-  <element name="ComplexTypeWithSDOAliasName">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithSDOAliasNameElement" type="tns:ComplexTypeWithSDOAliasNameType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
deleted file mode 100644
index 925e8625d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOName.xsd ">
-  <ComplexTypeWithSDONameElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithSDONameElement>
-</tns:ComplexTypeWithSDOName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
deleted file mode 100644
index b12bec040b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">    
-        
-  <complexType name="ComplexTypeWithSDONameType" sdo:name="ComplexTypeWithSDONameTypeSDOName">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>
-                 
-  <element name="ComplexTypeWithSDOName">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithSDONameElement" type="tns:ComplexTypeWithSDONameType"/>  
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
deleted file mode 100644
index c73708ce46..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithSDOSequence xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOSequence.xsd ">
-  <ComplexTypeWithSDOSequenceElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithSDOSequenceElement>
-</tns:ComplexTypeWithSDOSequence>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
deleted file mode 100644
index 795c3ea7d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-        
-  <complexType name="ComplexTypeWithSDOSequenceType" sdo:sequence="true">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType" />
-    </sequence>
-  </complexType>  
-                 
-  <element name="ComplexTypeWithSDOSequence">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithSDOSequenceElement" type="tns:ComplexTypeWithSDOSequenceType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
deleted file mode 100644
index 3ebdc89ae0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeWithoutContent xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithoutContent.xsd ">
-  <ComplexTypeWithoutContentElement/>
-</tns:ComplexTypeWithoutContent>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
deleted file mode 100644
index 21546d0f67..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <complexType name="ComplexTypeWithoutContentType"/>
-                 
-  <element name="ComplexTypeWithoutContent">
-    <complexType>
-      <sequence>
-         <element name="ComplexTypeWithoutContentElement" type="tns:ComplexTypeWithoutContentType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
deleted file mode 100644
index 89657e42ca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithoutName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithoutName.xsd ">
-  <tns:ComplexTypeWithoutNameType>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </tns:ComplexTypeWithoutNameType>
-</tns:ComplexTypeWithoutName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
deleted file mode 100644
index d01b4172e4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <element name="ComplexTypeWithoutNameType">
-    <complexType>
-      <sequence>
-        <element name="SimpleTypeWithName" type="string"/>
-      </sequence>
-    </complexType>
-  </element>
-                 
-  <element name="ComplexTypeWithoutName">
-    <complexType>
-      <sequence>
-        <element ref="tns:ComplexTypeWithoutNameType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
deleted file mode 100644
index 82fd1eedaf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.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.
--->
-<DefaultNamespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="DefaultNamespace.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</DefaultNamespace>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
deleted file mode 100644
index e1dcf06194..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ /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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" >
-  
-  <!-- top level test type -->       
-  <xsd:complexType name="DefaultNamespaceComplexType">
-    <xsd:sequence>
-      <!-- simple types -->
-      <xsd:element name="SimpleTypeWithName" type="xsd:string"/>
-
-    </xsd:sequence>
-  </xsd:complexType>
-        
-  <xsd:element name="Default" type="DefaultNamespaceComplexType"/>
-</xsd:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
deleted file mode 100644
index ebf03c9d5d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:ElementInAll xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementInAll.xsd ">
-  <ElementInAllElement>
-    <ElementInAllOne>ElementInAllOne</ElementInAllOne>
-    <ElementInAllTwo>ElementInAllTwo</ElementInAllTwo>
-  </ElementInAllElement>
-</tns:ElementInAll>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
deleted file mode 100644
index 8b9ba5b4b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <complexType name="ComplexTypeElementInAllTestType">
-    <all>
-      <element name="ElementInAllOne" type="string"/>
-      <element name="ElementInAllTwo" type="string"/>      
-    </all>
-  </complexType>
-            
-  <element name="ElementInAll">
-    <complexType>
-      <sequence>
-        <choice maxOccurs="3">
-          <element name="ElementInAllElement" type="tns:ComplexTypeElementInAllTestType"/>
-        </choice>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
deleted file mode 100644
index 26466b1b39..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInChoice.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.
--->
-<tns:ElementInChoice xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementInChoice.xsd ">
-  <Element1InChoice>Element1InChoice</Element1InChoice>
-  <Element2InChoice>Element2InChoice</Element2InChoice>
-</tns:ElementInChoice>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
deleted file mode 100644
index ff418c56ab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ /dev/null
@@ -1,48 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-          
-  <group name="Group1">
-    <sequence>
-      <element name="Element1InChoice" type="string" maxOccurs="2"/>
-      <element name="Element2InChoice" type="string" />
-    </sequence>
-  </group>
-  
-  <group name="Group2"> 
-    <sequence>
-      <element name="Element2InChoice" type="string" />
-      <element name="Element1InChoice" type="string" maxOccurs="2"/>
-    </sequence>     
-  </group>    
-  
-  <element name="ElementInChoice">
-    <complexType>
-      <sequence>
-        <choice maxOccurs="3">
-          <group ref="tns:Group1"/>
-          <group ref="tns:Group2"/>
-        </choice>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
deleted file mode 100644
index 27bb1ce9cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ /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.
--->
-<tns:ElementOfSDOChangeSummaryType xmlns:sdo="commonj.sdo" 
-                                   xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                   xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSDOChangeSummaryType.xsd commonj.sdo datagraph.xsd ">
-	<ElementOfSDOChangeSummaryTypeElement>
-          <ChangeSummaryElement>
-            ChangeSummaryText
-          </ChangeSummaryElement>
-	</ElementOfSDOChangeSummaryTypeElement>
-</tns:ElementOfSDOChangeSummaryType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
deleted file mode 100644
index 2bf1df8c99..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-  <import schemaLocation="datagraph.xsd" namespace="commonj.sdo"/>    
-                
-  <element name="ElementOfSDOChangeSummaryType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSDOChangeSummaryTypeElement" type="sdo:ChangeSummaryType"/>                
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
deleted file mode 100644
index 9b5561ed43..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithDefault xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                    xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithDefault.xsd ">
-  <ElementOfSimpleTypeWithDefaultElement>ElementOfSimpleTypeWithDefaultDefault</ElementOfSimpleTypeWithDefaultElement>
-</tns:ElementOfSimpleTypeWithDefault>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
deleted file mode 100644
index 0b4e7bdf45..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <element name="ElementOfSimpleTypeWithDefault">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithDefaultElement" type="string" default="ElementOfSimpleTypeWithDefaultDefault" />
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
deleted file mode 100644
index f1b7cd264c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithFixed xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                  xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithFixed.xsd ">
-  <ElementOfSimpleTypeWithFixedElement>ElementOfSimpleTypeWithFixedFixed</ElementOfSimpleTypeWithFixedElement>
-</tns:ElementOfSimpleTypeWithFixed>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
deleted file mode 100644
index a2c8456257..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <element name="ElementOfSimpleTypeWithFixed">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithFixedElement" type="string" fixed="ElementOfSimpleTypeWithFixedFixed" />      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
deleted file mode 100644
index 1f60b0423f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDODataType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                        xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDODataType.xsd ">
-  <ElementOfSimpleTypeWithSDODataTypeElement>ElementOfSimpleTypeWithSDODataTypeElement</ElementOfSimpleTypeWithSDODataTypeElement>
-</tns:ElementOfSimpleTypeWithSDODataType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
deleted file mode 100644
index 21e55ab8c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-                
-  <element name="ElementOfSimpleTypeWithSDODataType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDODataTypeElement" type="string" sdo:dataType="string"/>       
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
deleted file mode 100644
index 30762f4912..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDOOppositePropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                    xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOOppositePropertyType.xsd ">
-  <ElementOfSimpleTypeWithSDOOppositePropertyTypeElement>idvalue0</ElementOfSimpleTypeWithSDOOppositePropertyTypeElement>
-</tns:ElementOfSimpleTypeWithSDOOppositePropertyType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
deleted file mode 100644
index 5bf35d0d70..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-                
-  <element name="ElementOfSimpleTypeWithSDOOppositePropertyType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDOOppositePropertyTypeElement" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType" sdo:oppositeProperty="tns:ElementOfSimpleTypeWithSDOPropertyType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
deleted file mode 100644
index 2dd01e4090..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDOPropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOPropertyType.xsd ">
-  <ElementOfSimpleTypeWithSDOPropertyTypeElement>idvalue0</ElementOfSimpleTypeWithSDOPropertyTypeElement>
-</tns:ElementOfSimpleTypeWithSDOPropertyType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
deleted file mode 100644
index 6920cd8dd0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-                        
-  <element name="ElementOfSimpleTypeWithSDOPropertyType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDOPropertyTypeElement" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
deleted file mode 100644
index 6a526bdc47..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDOString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                      xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOString.xsd ">
-  <ElementOfSimpleTypeWithSDOStringElement>ElementOfSimpleTypeWithSDOStringElement</ElementOfSimpleTypeWithSDOStringElement>
-</tns:ElementOfSimpleTypeWithSDOString>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
deleted file mode 100644
index 1117a95eb8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-                        
-  <element name="ElementOfSimpleTypeWithSDOString">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDOStringElement" type="string" sdo:string="true"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
deleted file mode 100644
index ab91458bff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.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.
--->
-<tns:ElementSubstitutionGroupBase xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                  xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementSubstitutionGroupBase.xsd ">
-	<ElementSubstitutionGroupBaseElement>
-		<ElementInSubstitutionGroupBase>
-			ElementInSubstitutionGroupBase
-		</ElementInSubstitutionGroupBase>
-	</ElementSubstitutionGroupBaseElement>
-
-    <ElementSubstitutionUnrelated>Some Data</ElementSubstitutionUnrelated>
-
-	<ElementSubstitutionGroupExtends>
-		<ElementInSubstitutionGroupBase>
-			ElementInSubstitutionGroupBase
-		</ElementInSubstitutionGroupBase>
-		<ElementInSubstitutionGroupExtends>
-			ElementInSubstitutionGroupExtends
-		</ElementInSubstitutionGroupExtends>
-	</ElementSubstitutionGroupExtends>
-	
-</tns:ElementSubstitutionGroupBase>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
deleted file mode 100644
index 3e015843b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ /dev/null
@@ -1,52 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <complexType name="ComplexTypeSubstitutionGroupBaseType">
-    <sequence>
-      <element name="ElementInSubstitutionGroupBase" type="string"/>
-    </sequence>
-  </complexType>
-  <element name="ElementSubstitutionGroupBaseElement" type="tns:ComplexTypeSubstitutionGroupBaseType"/>
-
-  <element name="ElementSubstitutionGroupUnrelated" type="string" substitutionGroup="tns:ElementSubstitutionGroupBaseElement"/>
-  
-  <complexType name="ComplexTypeSubstitutionGroupExtendsType">
-    <complexContent>
-      <extension base="tns:ComplexTypeSubstitutionGroupBaseType">
-        <sequence>
-          <element name="ElementInSubstitutionGroupExtends" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  
-  <element name="ElementSubstitutionGroupExtends" type="tns:ComplexTypeSubstitutionGroupExtendsType" substitutionGroup="tns:ElementSubstitutionGroupBaseElement"/>
- 
-  <element name="ElementSubstitutionGroupBase">
-    <complexType>
-      <sequence>
-        <element ref="tns:ElementSubstitutionGroupBaseElement" maxOccurs="unbounded" />
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
deleted file mode 100644
index b6d68fd08a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.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.
--->
-<tns:ElementWithMaxOccurs xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithMaxOccurs.xsd ">
-  <ElementWithMaxOccursElement>ElementWithMaxOccursElement1</ElementWithMaxOccursElement>
-  <ElementWithMaxOccursElement>ElementWithMaxOccursElement2</ElementWithMaxOccursElement>  
-</tns:ElementWithMaxOccurs>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
deleted file mode 100644
index d4453a4477..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-          
-  <element name="ElementWithMaxOccurs">
-    <complexType>
-      <sequence>
-        <element name="ElementWithMaxOccursElement" type="string" maxOccurs="2"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
deleted file mode 100644
index 6de3adc937..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementWithNillable xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithNillable.xsd ">
-  <ElementWithNillableElement>ElementWithNillableElement</ElementWithNillableElement>
-</tns:ElementWithNillable>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
deleted file mode 100644
index 786ab226da..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <element name="ElementWithNillable">
-    <complexType>
-      <sequence>
-        <element name="ElementWithNillableElement" type="string" nillable="true" maxOccurs="unbounded"/>  
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
deleted file mode 100644
index 64093aa803..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                             xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithSDOAliasName.xsd ">
-  <ElementWithSDOAliasName>ElementWithSDOAliasName</ElementWithSDOAliasName>
-</tns:ElementWithSDOAliasName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
deleted file mode 100644
index 01f4c2b1ef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo"> 
-                
-  <element name="ElementWithSDOAliasName">
-    <complexType>
-      <sequence>
-        <element name="ElementWithSDOAliasName" sdo:aliasName="ElementWithSDOAliasNameSDOAliasName" type="string"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
deleted file mode 100644
index 774646f682..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ /dev/null
@@ -1,24 +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.
---> 
-<tns:ElementWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithSDOName.xsd ">
-  <ElementWithSDONameElement>ElementWithSDONameElement</ElementWithSDONameElement>
-</tns:ElementWithSDOName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
deleted file mode 100644
index 34da37564c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo"> 
-                
-  <element name="ElementWithSDOName">
-    <complexType>
-      <sequence>
-        <element name="ElementWithSDONameElement" sdo:name="ElementWithSDONameSDOName" type="string"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
deleted file mode 100644
index a1fb3aa803..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:GlobalElementComplexType xmlns:tns="http://www.apache.org/tuscany/interop"
-	                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	                          xsi:schemaLocation="http://www.apache.org/tuscany/interop GlobalElementComplexType.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:GlobalElementComplexType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
deleted file mode 100644
index 8eb7a4fce4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-         
-  <complexType name="GlobalElementComplexTypeComplexType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>  
-                 
-  <element name="GlobalElementComplexType" type="tns:GlobalElementComplexTypeComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
deleted file mode 100644
index f68eb1939d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<GlobalElementSimpleType xmlns="http://www.apache.org/tuscany/interop"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.apache.org/tuscany/interop GlobalElementSimpleType.xsd">
-	GlobalElementSimpleType
-</GlobalElementSimpleType>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
deleted file mode 100644
index b9f77e6658..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ /dev/null
@@ -1,26 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-                 
-  <element name="GlobalElementSimpleType" type="string"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Import.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Import.xml
deleted file mode 100644
index fd28850050..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Import.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.
--->
-<tns:Import xmlns:tns="http://www.apache.org/tuscany/interop"
-	        xmlns:imp="http://www.apache.org/tuscany/interop/import"
-	        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	        xsi:schemaLocation="http://www.apache.org/tuscany/interop Import.xsd">
-
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-	<Imported>
-           <AnElement>SomeString</AnElement>
-           <AnotherElement>SomeString</AnotherElement>
-    </Imported>
-</tns:Import>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Import.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Import.xsd
deleted file mode 100644
index eae93fd44a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:imp="http://www.apache.org/tuscany/interop/import"
-        xmlns:sdo="commonj.sdo"
-        xmlns:sdoJava="commonj.sdo">
-        
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-  <import  schemaLocation="ImportedSchema.xsd" 
-           namespace="http://www.apache.org/tuscany/interop/import"/> 
-      
-  <!-- top level test type -->       
-  <complexType name="ImportComplexType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-      <element name="Imported" type="imp:ImportedComplexType"/> 
-    </sequence>
-  </complexType>
-        
-  <element name="Import" type="tns:ImportComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
deleted file mode 100644
index a7e568decf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ /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.
--->
-
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:imp="http://www.apache.org/tuscany/interop/import"
-  targetNamespace="http://www.apache.org/tuscany/interop/import">
-
-  <xsd:complexType name="ImportedComplexType">
-    <xsd:sequence>
-      <xsd:element name="AnElement" type="xsd:string"/>
-      <xsd:element name="AnotherElement" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Include.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Include.xml
deleted file mode 100644
index d4b9e24fa6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Include xmlns:tns="http://www.apache.org/tuscany/interop"
-	         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	         xsi:schemaLocation="http://www.apache.org/tuscany/interop Include.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:Include>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Include.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Include.xsd
deleted file mode 100644
index 34ff314a19..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
- 
-  <include schemaLocation="../xsd/SimpleTypeWithName.xsd"/> 
-      
-  <!-- top level test type -->       
-  <complexType name="IncludeComplexType">
-    <sequence>
-      <!-- simple types -->
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-
-    </sequence>
-  </complexType>
-         
-  <element name="IncludeElement" type="tns:IncludeComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Interop.xsd
deleted file mode 100644
index ae22ab2c44..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ /dev/null
@@ -1,138 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-<!-- Causes SDO generator to crash
-  <include schemaLocation="../xsd/Annotation.xsd"/>
--->
-  <include schemaLocation="../xsd/Attribute.xsd"/>
-  <include schemaLocation="../xsd/AttributeReference.xsd"/>
-<!-- 
-  <include schemaLocation="AttributeWithDefaultValue.xsd"/>
-  <include schemaLocation="AttributeWithFixedValue.xsd"/>
-  <include schemaLocation="AttributeWithSDOAliasName.xsd"/>
-  <include schemaLocation="AttributeWithSDODataType.xsd"/>
-  <include schemaLocation="AttributeWithSDOName.xsd"/>
-  <include schemaLocation="AttributeWithSDOPropertySDOOppositePropertyType.xsd"/>
-  <include schemaLocation="AttributeWithSDOPropertyType.xsd"/>
-  <include schemaLocation="AttributeWithSDOString.xsd"/>
-  <include schemaLocation="BuiltInAnySimpleType.xsd"/>
-  <include schemaLocation="BuiltInAnyType.xsd"/>
-  <include schemaLocation="BuiltInAnyURI.xsd"/>
-  <include schemaLocation="BuiltInBase64Binary.xsd"/>
-  <include schemaLocation="BuiltInBoolean.xsd"/>
-  <include schemaLocation="BuiltInByte.xsd"/>
-  <include schemaLocation="BuiltInDate.xsd"/>
-  <include schemaLocation="BuiltInDateTime.xsd"/>
-  <include schemaLocation="BuiltInDecimal.xsd"/>
-  <include schemaLocation="BuiltInDouble.xsd"/>
-  <include schemaLocation="BuiltInDuration.xsd"/>
-  <include schemaLocation="BuiltInFloat.xsd"/>
-  <include schemaLocation="BuiltInGDay.xsd"/>
-  <include schemaLocation="BuiltInGMonth.xsd"/>
-  <include schemaLocation="BuiltInGMonthDay.xsd"/>
-  <include schemaLocation="BuiltInGYear.xsd"/>
-  <include schemaLocation="BuiltInGYearMonth.xsd"/>
-  <include schemaLocation="BuiltInHexBinary.xsd"/>
-  <include schemaLocation="BuiltInID.xsd"/>
-  <include schemaLocation="BuiltInIDREF.xsd"/>
-  <include schemaLocation="BuiltInIDREFS.xsd"/>
-  <include schemaLocation="BuiltInInt.xsd"/>
-  <include schemaLocation="BuiltInInteger.xsd"/>
-  <include schemaLocation="BuiltInLanguage.xsd"/>
-  <include schemaLocation="BuiltInLong.xsd"/>
-  <include schemaLocation="BuiltInNCName.xsd"/>
-  <include schemaLocation="BuiltInNMTOKEN.xsd"/>
-  <include schemaLocation="BuiltInNMTOKENS.xsd"/>
-  <include schemaLocation="BuiltInNOTATION.xsd"/>
-  <include schemaLocation="BuiltInName.xsd"/>
-  <include schemaLocation="BuiltInNegativeInteger.xsd"/>
-  <include schemaLocation="BuiltInNonNegativeInteger.xsd"/>
-  <include schemaLocation="BuiltInNonPositiveInteger.xsd"/>
-  <include schemaLocation="BuiltInNormalizedString.xsd"/>
-  <include schemaLocation="BuiltInPositiveInteger.xsd"/>
-  <include schemaLocation="BuiltInQName.xsd"/>
-  <include schemaLocation="BuiltInShort.xsd"/>
-  <include schemaLocation="BuiltInString.xsd"/>
-  <include schemaLocation="BuiltInTime.xsd"/>
-  <include schemaLocation="BuiltInToken.xsd"/>
-  <include schemaLocation="BuiltInUnsignedByte.xsd"/>
-  <include schemaLocation="BuiltInUnsignedInt.xsd"/>
-  <include schemaLocation="BuiltInUnsignedLong.xsd"/>
-  <include schemaLocation="BuiltInUnsignedShort.xsd"/>
-  <include schemaLocation="ComplexTypeComplexContentRestrictingComplexType.xsd"/>
-  <include schemaLocation="ComplexTypeExtendingComplexType.xsd"/>
-  <include schemaLocation="ComplexTypeExtendingSimpleType.xsd"/>
-  <include schemaLocation="ComplexTypeSimpleContentRestrictingComplexType.xsd"/>
-  <include schemaLocation="ComplexTypeWithAbstract.xsd"/>
-  <include schemaLocation="ComplexTypeWithCDATA.xsd"/>
--->
-  <include schemaLocation="../xsd/ComplexTypeWithContent.xsd"/>
-<!--
-  <include schemaLocation="ComplexTypeWithMixed.xsd"/>
-  <include schemaLocation="ComplexTypeWithOpenAttributes.xsd"/>
-  <include schemaLocation="ComplexTypeWithOpenContent.xsd"/>
-  <include schemaLocation="ComplexTypeWithOppositeProperty.xsd"/>
-  <include schemaLocation="ComplexTypeWithSDOAliasName.xsd"/>
-  <include schemaLocation="ComplexTypeWithSDOName.xsd"/>
-  <include schemaLocation="ComplexTypeWithSDOSequence.xsd"/>
-  <include schemaLocation="ComplexTypeWithoutContent.xsd"/>
-  <include schemaLocation="ComplexTypeWithoutName.xsd"/>
-  <include schemaLocation="DefaultNamespace.xsd"/>
-  <include schemaLocation="ElementInAll.xsd"/>
-  <include schemaLocation="ElementInChoice.xsd"/>
-  <include schemaLocation="ElementOfSDOChangeSummaryType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithDefault.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithFixed.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDODataType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDOOppositePropertyType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDOPropertyType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDOString.xsd"/>
-  <include schemaLocation="ElementSubstitutionGroupBase.xsd"/>
-  <include schemaLocation="ElementWithMaxOccurs.xsd"/>
-  <include schemaLocation="ElementWithNillable.xsd"/>
-  <include schemaLocation="ElementWithSDOAliasName.xsd"/>
-  <include schemaLocation="ElementWithSDOName.xsd"/>
-  <include schemaLocation="GlobalElementComplexType.xsd"/>
-  <include schemaLocation="GlobalElementSimpleType.xsd"/>
-  <include schemaLocation="Import.xsd"/>
-  <include schemaLocation="ImportedSchema.xsd"/>
--->
-  <include schemaLocation="../xsd/Include.xsd"/>
-<!--
-  <include schemaLocation="Notation.xsd"/>
-  <include schemaLocation="SDOJavaPackage.xsd"/>
--->
-  <include schemaLocation="../xsd/SimpleTypeWithAbstract.xsd"/>
-<!-- 
-  <include schemaLocation="SimpleTypeWithExtendedInstanceClass.xsd"/>
-  <include schemaLocation="SimpleTypeWithInstanceClass.xsd"/>
-  <include schemaLocation="SimpleTypeWithList.xsd"/>
--->
-  <include schemaLocation="../xsd/SimpleTypeWithName.xsd"/>
-<!--
-  <include schemaLocation="SimpleTypeWithSDOName.xsd"/>
-  <include schemaLocation="SimpleTypeWithUnion.xsd"/>
-  <include schemaLocation="SimpleTypeWithoutName.xsd"/>
-  <include schemaLocation="TargetNamespace.xsd"/>    
--->
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Notation.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Notation.xml
deleted file mode 100644
index b75ac6500a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Notation xmlns:tns="http://www.apache.org/tuscany/interop" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.apache.org/tuscany/interop Notation.xsd ">
-tns:Tuscany
-</tns:Notation>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Notation.xsd
deleted file mode 100644
index 6ad019cb81..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <notation name="Tuscany" public="http://cwiki.apache.org/TUSCANY/"/>
-  <notation name="PHP_SCA_SDO" public="http://pecl.php.net/package/sca_sdo/"/>
-           
-  <simpleType name="NotationSimpleType">
-      <restriction base="NOTATION">
-          <enumeration value="tns:Tuscany"/>
-          <enumeration value="tns:PHP_SCA_SDO"/>
-      </restriction>
-  </simpleType>
-  
-  <element name="Notation" type="tns:NotationSimpleType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Person.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Person.xsd
deleted file mode 100644
index 5f5021b15e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ /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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://apache.org/tuscany/sca/itest/databinding/types">
-
-    <xsd:complexType name="PersonType">
-        <xsd:sequence>
-            <xsd:element name="firstName" type="xsd:string" />
-            <xsd:element name="lastName" type="xsd:string" />
-            <xsd:element name="greeting" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-</xsd:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
deleted file mode 100644
index 6c5ad88ff4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.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.
--->
-<tns:SDOJavaPackage xmlns:p="commonj.sdo"
-	xmlns:tns="http://www.apache.org/tuscany/interop"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.apache.org/tuscany/interop interop05.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:SDOJavaPackage>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
deleted file mode 100644
index 6b7e39b334..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo/java"
-        sdoJava:package="org.apache.tuscany">
- 
-  <!-- should be a reference to the real schema wherever that is going to be -->
-  <import schemaLocation="sdoJava.xsd" namespace="commonj.sdo/java"/>
-  
-  <!-- top level test type -->       
-  <complexType name="SDOJavaPackageComplexType">
-    <sequence>
-      <!-- simple types -->
-      <element name="SimpleTypeWithName" type="string"/>
-
-    </sequence>
-  </complexType>
-        
-  <element name="SDOJavaPackage" type="tns:SDOJavaPackageComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
deleted file mode 100644
index f9d4a24a49..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithAbstract xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithAbstract.xsd ">
-  <SimpleTypeWithAbstractExtensionElement>SimpleTypeWithAbstractExtensionElement</SimpleTypeWithAbstractExtensionElement>
-</tns:SimpleTypeWithAbstract>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
deleted file mode 100644
index f649e2ba83..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">      
-        
-  <!--simpleType name="SimpleTypeWithAbstractType" abstract="true"-->
-  <simpleType name="SimpleTypeWithAbstractType" >
-    <restriction base="string"/>
-  </simpleType>
-
-  <simpleType name="SimpleTypeWithAbstractExtensionType">
-    <restriction base="tns:SimpleTypeWithAbstractType"/>
-  </simpleType>
-                 
-  <complexType name="SimpleTypeWithAbstractComplexType">
-    <sequence>
-      <element name="SimpleTypeWithAbstractExtensionElement" type="tns:SimpleTypeWithAbstractExtensionType"/>  
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithAbstract" type="tns:SimpleTypeWithAbstractComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
deleted file mode 100644
index 410df4b7e4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithExtendedInstanceClass xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                         xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithExtendedInstanceClass.xsd ">
-  <SimpleTypeWithExtendedInstanceClassElement>SimpleTypeWithExtendedInstanceClassElement</SimpleTypeWithExtendedInstanceClassElement>
-</tns:SimpleTypeWithExtendedInstanceClass>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
deleted file mode 100644
index 5d27ef5ce1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">                
-        
-  <simpleType name="SimpleTypeWithExtendedInstanceClassType" sdoJava:extendedInstanceClass="String">
-  	<restriction base="string"/>
-  </simpleType>             
-
-  <complexType name="SimpleTypeWithExtendedInstanceClassComplexType">
-    <sequence>
-      <element name="SimpleTypeWithExtendedInstanceClassElement" type="tns:SimpleTypeWithExtendedInstanceClassType"/>                               
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithExtendedInstanceClass" type="SimpleTypeWithExtendedInstanceClassComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
deleted file mode 100644
index 7b74867c03..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithInstanceClass xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                 xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithInstanceClass.xsd ">
-  <SimpleTypeWithInstanceClassElement>SimpleTypeWithInstanceClassElement</SimpleTypeWithInstanceClassElement>
-</tns:SimpleTypeWithInstanceClass>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
deleted file mode 100644
index ec16a678a3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">       
-        
-  <simpleType name="SimpleTypeWithInstanceClassType" sdoJava:instanceClass="String">
-  	<restriction base="string"/>
-  </simpleType>
-                 
-
-  <complexType name="SimpleTypeWithInstanceClassComplexType">
-    <sequence>
-      <element name="SimpleTypeWithInstanceClassElement" type="tns:SimpleTypeWithInstanceClassType"/>       
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithInstanceClass" type="SimpleTypeWithInstanceClassComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
deleted file mode 100644
index 708d526f44..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithList xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithList.xsd ">
-  <SimpleTypeWithListElement>listmember1 listmember2</SimpleTypeWithListElement>
-</tns:SimpleTypeWithList>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
deleted file mode 100644
index ed681009f9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">                
-        
-  <simpleType name="SimpleTypeWithListType">
-  	<list itemType="string"/>
-  </simpleType>
-                 
-
-  <complexType name="SimpleTypeWithListComplexType">
-    <sequence>
-      <element name="SimpleTypeWithListElement" type="tns:SimpleTypeWithListType"/>                               
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithList" type="SimpleTypeWithListComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
deleted file mode 100644
index e404ac86b7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithName.xsd ">
-  <SimpleTypeWithNameElement>SimpleTypeWithNameElement</SimpleTypeWithNameElement>
-</tns:SimpleTypeWithName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
deleted file mode 100644
index af0431f048..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-  <simpleType name="SimpleTypeWithNameType">
-    <restriction base="string"/>
-  </simpleType>
-  
-  <complexType name="SimpleTypeWithNameComplexType">
-    <sequence>
-      <element name="SimpleTypeWithNameElement" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-  </complexType>
-                 
-  <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameComplexType"/>
-
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
deleted file mode 100644
index c86a0f6bcb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                           xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithSDOName.xsd ">
-  <SimpleTypeWithSDONameElement>SimpleTypeWithSDONameElement</SimpleTypeWithSDONameElement>
-</tns:SimpleTypeWithSDOName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
deleted file mode 100644
index 89b00a36cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">     
-        
-  <simpleType name="SimpleTypeWithSDONameType" sdo:name="SimpleTypeWithSDONameTypeSDOName">
-	<restriction base="string"/>
-  </simpleType>
-                 
-  
-  <complexType name="SimpleTypeWithSDONameComplexType">
-    <sequence>
-      <element name="SimpleTypeWithSDONameElement" type="tns:SimpleTypeWithSDONameType"/>
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithSDOName" type="tns:SimpleTypeWithSDONameComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
deleted file mode 100644
index 399b0d8175..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.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.
--->
-<tns:SimpleTypeWithUnion xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithUnion.xsd ">
-  <SimpleTypeWithUnionElement>EN</SimpleTypeWithUnionElement>
-  <SimpleTypeWithUnionElement>01:02:03</SimpleTypeWithUnionElement>
-</tns:SimpleTypeWithUnion>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
deleted file mode 100644
index ea35bec61a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ /dev/null
@@ -1,46 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">             
-        
-  <simpleType name="SimpleTypeWithUnionType">
-  	<union>
-  	  <simpleType>
-  	    <restriction base="language">
-  	    </restriction>
-  	  </simpleType>
-  	  <simpleType>
-  	    <restriction base="time">
-  	    </restriction>
-  	  </simpleType>
-  	</union>
-  </simpleType>
-                 
-  
-  <complexType name="SimpleTypeWithUnionComplexType">
-    <sequence>
-      <element name="SimpleTypeWithUnionElement" type="tns:SimpleTypeWithUnionType" minOccurs="2" maxOccurs="2"/>                               
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithUnion" type="SimpleTypeWithUnionComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
deleted file mode 100644
index bc8cf35368..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +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.
--->
- <SimpleTypeWithoutName xmlns="http://www.apache.org/tuscany/interop"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithoutName.xsd">
-	<SimpleTypeWithoutNameElement>
-		SimpleTypeWithoutName
-	</SimpleTypeWithoutNameElement>
-</SimpleTypeWithoutName>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
deleted file mode 100644
index 57981e3666..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-  <element name="SimpleTypeWithoutNameElement">
-    <simpleType>
-      <restriction base="string"/>
-    </simpleType>
-  </element>  
-                 
-
-  <complexType name="SimpleTypeWithoutNameComplexType">
-    <sequence>
-       <element ref="tns:SimpleTypeWithoutNameElement"/>
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithoutName" type="SimpleTypeWithoutNameComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
deleted file mode 100644
index da2929776e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:TargetNamespace xmlns:tns="http://www.apache.org/tuscany/interop"
-	               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	               xsi:schemaLocation="http://www.apache.org/tuscany/interop TargetNamespace.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:TargetNamespace>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
deleted file mode 100644
index ace5427786..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
- 
-  <!-- top level test type -->       
-  <complexType name="TargetNamespaceComplexType">
-    <sequence>
-      <!-- simple types -->
-      <element name="SimpleTypeWithName" type="string"/>
-
-    </sequence>
-  </complexType>
-        
-  <element name="TargetNamespace" type="tns:TargetNamespaceComplexType"/>
-</schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
deleted file mode 100644
index e6b9697a8d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:sdo="commonj.sdo"
-  xmlns:sdoJava="commonj.sdo/java"
-  targetNamespace="commonj.sdo">
-
-  <xsd:element name="datagraph" type="sdo:DataGraphType"/>
-  
-  <xsd:complexType name="DataGraphType">
-    <xsd:complexContent>
-      <xsd:extension base="sdo:BaseDataGraphType">
-        <xsd:sequence>
-          <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" processContents="lax"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="BaseDataGraphType" abstract="true">
-    <xsd:sequence>
-      <xsd:element name="models" type="sdo:ModelsType" minOccurs="0"/>
-      <xsd:element name="xsd" type="sdo:XSDType" minOccurs="0"/>
-      <xsd:element name="changeSummary" type="sdo:ChangeSummaryType" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax"/>
-  </xsd:complexType>
-    
-  <xsd:complexType name="ModelsType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Expected type is emof:Package.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="XSDType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Expected type is xsd:schema.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- FB TEMP -->
-  <xsd:simpleType name="ChangeSummaryType" sdoJava:instanceClass="commonj.sdo.ChangeSummary">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-<!--
-  <xsd:complexType name="ChangeSummaryType">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="create" type="xsd:string"/>
-    <xsd:attribute name="delete" type="xsd:string"/>
-    <xsd:attribute name="logging" type="xsd:boolean"/>
-  </xsd:complexType>
--->
-
-  <xsd:attribute name="ref" type="xsd:string"/>
-  <xsd:attribute name="unset" type="xsd:string"/>
-
-</xsd:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
deleted file mode 100644
index 7387568942..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-  targetNamespace="commonj.sdo/java"
-  xmlns:sdoJava="commonj.sdo/java"
-  xmlns:sdo="commonj.sdo"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
-
-<!--
-   These attributes are used to customize the Java mapping of 
-   XSD to SDO Types and Properties.
--->
-
-<xsd:attribute name="package" type="xsd:string" />
-<xsd:attribute name="instanceClass" type="xsd:string" />
-<xsd:attribute name="extendedInstanceClass" type="xsd:string" />
-<xsd:attribute name="nestedInterfaces" type="xsd:boolean" />
-
-<!--
-   Global properties used in open content for 
-   the Java binding of SDO Types and Properties.
--->
-
-<xsd:attribute name="javaClass" type="sdo:String"/>
-
-<!-- JavaInfo deprecated in 2.1.0 -->
-<xsd:complexType name="JavaInfo">
-  <xsd:attribute name="javaClass" type="sdo:String"/>
-</xsd:complexType>
-
-<!--
-   The Java object data types.
--->
-
-<xsd:simpleType name="BooleanObject" sdoJava:instanceClass="java.lang.Boolean">
-  <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ByteObject" sdoJava:instanceClass="java.lang.Byte">
-  <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="CharacterObject" sdoJava:instanceClass="java.lang.Character">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DoubleObject" sdoJava:instanceClass="java.lang.Double">
-  <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="FloatObject" sdoJava:instanceClass="java.lang.Float">
-  <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="IntObject" sdoJava:instanceClass="java.lang.Integer">
-  <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="LongObject" sdoJava:instanceClass="java.lang.Long">
-  <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ShortObject" sdoJava:instanceClass="java.lang.Short">
-  <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
deleted file mode 100644
index c5aabc9cc8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
-
--->
-
-<xsd:schema 
-  targetNamespace="commonj.sdo"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:sdo="commonj.sdo"
-  xmlns:sdoXML="commonj.sdo/xml"
-  xmlns:sdoJava="commonj.sdo/java"
-  elementFormDefault="qualified"
-  xsi:schemaLocation="commonj.sdo/xml sdoXML.xsd
-                  commonj.sdo/java sdoJava.xsd"> 
-  
-<xsd:include schemaLocation="datagraph.xsd"/>
-  
-<!-- Root element for defining several Types in one document.
-       Is not part of the model.
--->
-<xsd:element name="types" type="sdo:Types"/>
-<xsd:complexType name="Types">
-  <xsd:sequence>
-    <xsd:element name="type" type="sdo:Type" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<!-- Any data object may be serialized with this element,
-      with xsi:type to declare the
-      actual type of the DataObject serialized.
--->      
-<xsd:element name="dataObject" type="xsd:anyType"/>
-
-<!-- Model Types 
-   SDO Type and Property are defined in terms of themselves.
--->
-<xsd:element name="type" type="sdo:Type"/>
-<xsd:complexType name="Type">
-  <xsd:sequence>
-    <xsd:element name="baseType" type="sdo:URI" 
-      minOccurs="0" maxOccurs="unbounded"
-      sdoXML:propertyType="sdo:Type" />
-    <xsd:element name="property" type="sdo:Property" 
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:element name="aliasName" type="sdo:String"
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:any namespace="##other" processContents="lax" 
-      minOccurs="0" maxOccurs="unbounded" />
-  </xsd:sequence>
-  <xsd:attribute name="name" type="xsd:ID" sdoXML:dataType="sdo:String"/>
-  <xsd:attribute name="uri" type="sdo:URI"/>
-  <xsd:attribute name="dataType" type="sdo:Boolean"/>
-  <xsd:attribute name="open" type="sdo:Boolean"/>
-  <xsd:attribute name="sequenced" type="sdo:Boolean"/>
-  <xsd:attribute name="abstract" type="sdo:Boolean"/>
-  <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<xsd:complexType name="Property">
-  <xsd:sequence>
-    <xsd:element name="aliasName" type="sdo:String"
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:any namespace="##other" processContents="lax" 
-      minOccurs="0" maxOccurs="unbounded" />
-  </xsd:sequence>
-  <xsd:attribute name="name" type="sdo:String"/>
-  <xsd:attribute name="many" type="sdo:Boolean"/>
-  <xsd:attribute name="containment" type="sdo:Boolean"/>
-  <xsd:attribute name="default" type="sdo:String"/>
-  <xsd:attribute name="readOnly" type="sdo:Boolean"/>
-  <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type"/>
-  <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property"/>
-  <xsd:attribute name="nullable" type="sdo:Boolean"/>
-  <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<!-- Special Types -->
-<xsd:complexType name="DataObject" abstract="true"/>
-
-<!-- TextType deprecated in 2.1.0 -->
-      <xsd:complexType name="TextType" abstract="true">
-        <xsd:sequence>
-          <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
-        </xsd:sequence>
-      </xsd:complexType>
-
-<!-- ChangeSummaryType is defined in datagraph.xsd.
-       Although declared there as a ComplexType,
-       at the model level it is treated as a SimpleType
-       with a special XML serialization.
--->
-
-<!-- Data Types -->
-<xsd:simpleType name="Boolean" sdoJava:instanceClass="boolean">
-  <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Byte" sdoJava:instanceClass="byte">
-  <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Bytes" sdoJava:instanceClass="byte[]">
-  <xsd:restriction base="xsd:hexBinary"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Character" sdoJava:instanceClass="char">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Date" sdoJava:instanceClass="java.util.Date">
-  <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DateTime" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Day" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Decimal" sdoJava:instanceClass="java.math.BigDecimal">
-  <xsd:restriction base="xsd:decimal"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Double" sdoJava:instanceClass="double">
-  <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Duration" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:duration"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Float" sdoJava:instanceClass="float">
-  <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Int" sdoJava:instanceClass="int">
-  <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Integer" sdoJava:instanceClass="java.math.BigInteger">
-  <xsd:restriction base="xsd:integer"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Long"  sdoJava:instanceClass="long">
-  <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Month" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="MonthDay" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gMonthDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Object"  sdoJava:instanceClass="java.lang.Object">
-  <!-- Only the schema for schemas is allowed to restrict anySimpleType.
-         <xsd:restriction base="xsd:anySimpleType"/>
-       The equivalent declaration is a union of the predefined XSD data types.
-  -->
-  <xsd:union memberTypes="xsd:anyURI xsd:base64Binary xsd:boolean xsd:byte
-    xsd:date xsd:dateTime xsd:decimal xsd:double xsd:duration xsd:ENTITIES xsd:ENTITY xsd:float
-    xsd:gDay xsd:gMonth xsd:gMonthDay xsd:gYear xsd:gYearMonth xsd:hexBinary xsd:ID xsd:IDREF xsd:IDREFS
-    xsd:int xsd:integer xsd:language xsd:long xsd:Name xsd:NCName xsd:negativeInteger
-    xsd:NMTOKEN xsd:NMTOKENS xsd:nonNegativeInteger xsd:nonPositiveInteger
-    xsd:normalizedString xsd:NOTATION xsd:positiveInteger xsd:QName xsd:short xsd:string
-    xsd:time xsd:token xsd:unsignedByte xsd:unsignedInt xsd:unsignedLong xsd:unsignedShort"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Short" sdoJava:instanceClass="short">
-  <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="String" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Strings" sdoJava:instanceClass="java.util.List">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Time" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:time"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Year" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gYear"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonth" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gYearMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonthDay" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:date"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="URI" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:anyURI"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/tags/java/sca/1.3-RC1a/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
deleted file mode 100644
index fa3f310d4d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ /dev/null
@@ -1,49 +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.itest.generate;
-
-import junit.framework.TestCase;
-
-
-/**
- * 
- */
-public class GenerateTestCase extends TestCase {
-
-    //private Generate generator = null;
-
-    @Override
-    protected void setUp() throws Exception {
-        //generator = new Generate();
-    }
-
-    @Override
-    protected void tearDown() {
-    }
-
-    /**
-     * Invokes the Generate class to generate databinding test classes and resources. 
-     * 
-     * @throws Exception
-     */
-    public void testGenerate() throws Exception {
-        //generator.generate();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/config.png b/tags/java/sca/1.3-RC1a/itest/databindings/config.png
deleted file mode 100644
index 7912019e9d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/config.png
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/config.svg b/tags/java/sca/1.3-RC1a/itest/databindings/config.svg
deleted file mode 100644
index aaf027e2df..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/config.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg3168"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings"
-   sodipodi:docname="config.svg">
-  <defs
-     id="defs3170" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="375"
-     inkscape:cy="748.57143"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="990"
-     inkscape:window-height="664"
-     inkscape:window-x="103"
-     inkscape:window-y="84" />
-  <metadata
-     id="metadata3173">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3194"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84"><flowRegion
-         id="flowRegion3196"><rect
-           id="rect3198"
-           width="505.71429"
-           height="531.42859"
-           x="94.285713"
-           y="83.790756" /></flowRegion><flowPara
-         id="flowPara3200">&lt;tns:Generate ...&gt;</flowPara><flowPara
-         id="flowPara3202">  &lt;Template&gt;</flowPara><flowPara
-         id="flowPara3204">    &lt;TemplateName&gt;greeter.composite.vm&lt;/TemplateName&gt;</flowPara><flowPara
-         id="flowPara3206">    &lt;TemplateTargetDir&gt;classes&lt;/TemplateTargetDir&gt;</flowPara><flowPara
-         id="flowPara3208">  &lt;/Template&gt;</flowPara><flowPara
-         id="flowPara3210">  ...</flowPara><flowPara
-         id="flowPara3212">             </flowPara><flowPara
-         id="flowPara3214">  &lt;InputFile&gt;</flowPara><flowPara
-         id="flowPara3216">    &lt;FileName&gt;Person.xsd&lt;/FileName&gt;</flowPara><flowPara
-         id="flowPara3218">    &lt;FilePath&gt;xsd&lt;/FilePath&gt;</flowPara><flowPara
-         id="flowPara3220">    &lt;JavaPackage&gt;org.apache.tuscany.sca.itest.databinding.types&lt;/JavaPackage&gt;</flowPara><flowPara
-         id="flowPara3222">    &lt;Factory&gt;TypesFactory&lt;/Factory&gt;</flowPara><flowPara
-         id="flowPara3224">    &lt;Namespace&gt;http://apache.org/tuscany/sca/itest/databinding/types&lt;/Namespace&gt;</flowPara><flowPara
-         id="flowPara3226">    &lt;Prefix&gt;p&lt;/Prefix&gt;</flowPara><flowPara
-         id="flowPara3228">    &lt;Type&gt;</flowPara><flowPara
-         id="flowPara3230">      &lt;TypeName&gt;PersonType&lt;/TypeName&gt;</flowPara><flowPara
-         id="flowPara3232">      &lt;CreateTypeCode&gt;</flowPara><flowPara
-         id="flowPara3234">        TypesFactory factory = TypesFactory.INSTANCE;</flowPara><flowPara
-         id="flowPara3236">        param = factory.createPersonType();</flowPara><flowPara
-         id="flowPara3238">        param.setFirstName(&quot;George&quot;);</flowPara><flowPara
-         id="flowPara3240">        param.setLastName(&quot;Doors&quot;);</flowPara><flowPara
-         id="flowPara3242">      &lt;/CreateTypeCode&gt;</flowPara><flowPara
-         id="flowPara3244">      &lt;ModifyTypeCode&gt;</flowPara><flowPara
-         id="flowPara3246">        param.setGreeting(&quot;Hello&quot;);</flowPara><flowPara
-         id="flowPara3248">      &lt;/ModifyTypeCode&gt;</flowPara><flowPara
-         id="flowPara3250">      &lt;ResultComparison&gt;</flowPara><flowPara
-         id="flowPara3252">        assertNotSame(&quot;greetedPerson.getGreeting() not set&quot;, &quot;&quot;, result.getGreeting());</flowPara><flowPara
-         id="flowPara3254">      &lt;/ResultComparison&gt;</flowPara><flowPara
-         id="flowPara3256">    &lt;/Type&gt;</flowPara><flowPara
-         id="flowPara3258">  &lt;/InputFile&gt;</flowPara><flowPara
-         id="flowPara3260">  ...</flowPara><flowPara
-         id="flowPara3262"></flowPara><flowPara
-         id="flowPara3264">&lt;/tns:Generate&gt;</flowPara></flowRoot>  </g>
-</svg>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/databinding.png b/tags/java/sca/1.3-RC1a/itest/databindings/databinding.png
deleted file mode 100644
index 76a9c71b7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/databinding.png
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/databinding.svg b/tags/java/sca/1.3-RC1a/itest/databindings/databinding.svg
deleted file mode 100644
index d6850ccf7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/databinding.svg
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings"
-   sodipodi:docname="databinding.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings\databinding.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3078"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="499.13602"
-     inkscape:cy="337.74555"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1180"
-     inkscape:window-height="775"
-     inkscape:window-x="36"
-     inkscape:window-y="42" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1.084673,0,0,0.856154,-21.78728,27.4907)">
-      <rect
-         rx="15.307091"
-         ry="15.260983"
-         y="192.00233"
-         x="258.31146"
-         height="360.71414"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.07541251;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">GreeterService</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="312.05917"
-       y="258.59619"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(44.4684,52.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">DefaultGreeter</flowPara><flowPara
-         id="flowPara2019">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 294.90867,290.44317 L 328.24371,290.44317 L 334.30462,303.57515 L 327.23356,315.69699 L 294.90867,315.69699 L 302.48482,303.57515 L 294.90867,290.44317 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 408.16111,288.60489 L 441.49615,288.60489 L 447.55706,301.73687 L 440.486,313.85871 L 408.16111,313.85871 L 415.73726,301.73687 L 408.16111,288.60489 z "
-       id="path3019" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1985"
-       width="115.66247"
-       height="85.862968"
-       x="642.96918"
-       y="315.88455"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1987"
-       transform="translate(375.3784,109.946)"><flowRegion
-         id="flowRegion1989"><rect
-           id="rect1991"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1993">GreeterService</flowPara><flowPara
-         id="flowPara2017">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 625.81867,347.73153 L 659.15371,347.73153 L 665.21462,360.86351 L 658.14356,372.98535 L 625.81867,372.98535 L 633.39482,360.86351 L 625.81867,347.73153 z "
-       id="path1997" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2001"
-       width="115.66247"
-       height="85.862968"
-       x="313.68344"
-       y="371.59885"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2003"
-       transform="translate(46.09269,165.6602)"><flowRegion
-         id="flowRegion2005"><rect
-           id="rect2007"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2009">WSGreeter</flowPara><flowPara
-         id="flowPara2021">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 296.53296,403.44581 L 329.868,403.44581 L 335.92891,416.57779 L 328.85785,428.69963 L 296.53296,428.69963 L 304.10911,416.57779 L 296.53296,403.44581 z "
-       id="path2013" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 409.7854,401.60753 L 443.12044,401.60753 L 449.18135,414.73951 L 442.11029,426.86135 L 409.7854,426.86135 L 417.36155,414.73951 L 409.7854,401.60753 z "
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-opacity:1"
-       d="M 447.14297,301.23734 L 527.11201,301.95163 L 526.12473,354.09448 L 626.8265,354.80877"
-       id="path2039" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 463.87333,395.75343 L 516.54902,395.75343 L 526.12641,417.42827 L 514.95279,437.43583 L 463.87333,437.43583 L 475.84509,417.42827 L 463.87333,395.75343 z "
-       id="path3108"
-       inkscape:transform-center-y="-33.571429"
-       inkscape:transform-center-x="31.706144" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 535.3019,397.182 L 577.70287,397.182 L 585.41213,416.99969 L 576.41799,435.29297 L 535.3019,435.29297 L 544.93849,416.99969 L 535.3019,397.182 z "
-       id="path3110" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3112"
-       transform="matrix(0.778099,0,0,0.884748,255.7727,214.0266)"><flowRegion
-         id="flowRegion3114"><rect
-           id="rect3116"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3120">WS</flowPara><flowPara
-         id="flowPara3124">Reference</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3128"
-       transform="matrix(0.778099,0,0,0.884748,324.368,215.5376)"><flowRegion
-         id="flowRegion3130"><rect
-           id="rect3132"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3134">WS</flowPara><flowPara
-         id="flowPara3136">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 447.85714,415.52305 L 475.71429,415.52305"
-       id="path3138" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 525.71429,417.66591 L 543.57143,417.66591"
-       id="path3140" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 585.71429,416.23734 L 599.28571,416.23734 L 600,364.80877 L 629.28571,364.80877"
-       id="path3142" />
-  </g>
-</svg>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop.png b/tags/java/sca/1.3-RC1a/itest/databindings/interop.png
deleted file mode 100644
index 005e0f24ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop.png
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop.svg b/tags/java/sca/1.3-RC1a/itest/databindings/interop.svg
deleted file mode 100644
index 03897c6d09..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop.svg
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings"
-   sodipodi:docname="interop.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings\interop.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3078"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="428.95418"
-     inkscape:cy="356.33178"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1234"
-     inkscape:window-height="800"
-     inkscape:window-x="27"
-     inkscape:window-y="108" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.979246,0,0,1.158467,-105.7257,-23.34339)">
-      <rect
-         rx="25.230545"
-         ry="12.196672"
-         y="179.85953"
-         x="146.34595"
-         height="288.28497"
-         width="817.08154"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.87776983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-102.7603,-25.12021)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">InteropGreeterService</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3332"
-       width="115.66247"
-       height="85.862968"
-       x="77.514153"
-       y="231.09024"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3334"
-       transform="translate(-185.0766,21.58025)"><flowRegion
-         id="flowRegion3336"><rect
-           id="rect3338"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3340">SDO</flowPara><flowPara
-         id="flowPara3379">DefaultGreeter</flowPara><flowPara
-         id="flowPara2019">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 60.363662,262.93721 L 93.698702,262.93721 L 99.759609,276.06919 L 92.688552,288.19103 L 60.363662,288.19103 L 67.939812,276.06919 L 60.363662,262.93721 z "
-       id="path3343" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 173.6161,261.09893 L 206.95114,261.09893 L 213.01205,274.23091 L 205.94099,286.35275 L 173.6161,286.35275 L 181.19225,274.23091 L 173.6161,261.09893 z "
-       id="path3345" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1985"
-       width="115.66247"
-       height="85.862968"
-       x="681.65045"
-       y="289.48157"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1987"
-       transform="translate(423.3454,80.68594)"><flowRegion
-         id="flowRegion1989"><rect
-           id="rect1991"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1993">SDO</flowPara><flowPara
-         id="flowPara3399">GreeterService</flowPara><flowPara
-         id="flowPara2017">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 664.49995,321.32854 L 697.83499,321.32854 L 703.8959,334.46052 L 696.82484,346.58236 L 664.49995,346.58236 L 672.0761,334.46052 L 664.49995,321.32854 z "
-       id="path1997" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2001"
-       width="115.66247"
-       height="85.862968"
-       x="76.281281"
-       y="356.23575"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2003"
-       transform="translate(-185.5951,150.2971)"><flowRegion
-         id="flowRegion2005"><rect
-           id="rect2007"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2009">SDO</flowPara><flowPara
-         id="flowPara3401">WSGreeter</flowPara><flowPara
-         id="flowPara2021">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 59.130809,388.08271 L 92.465849,388.08271 L 98.526759,401.21469 L 91.455699,413.33653 L 59.130809,413.33653 L 66.706959,401.21469 L 59.130809,388.08271 z "
-       id="path2013" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 172.38325,386.24443 L 205.71829,386.24443 L 211.7792,399.37641 L 204.70814,411.49825 L 172.38325,411.49825 L 179.9594,399.37641 L 172.38325,386.24443 z "
-       id="path2015" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.47114,380.39017 L 271.82375,380.39017 L 280.06966,400.95073 L 270.44943,419.92971 L 226.47114,419.92971 L 236.77856,400.95073 L 226.47114,380.39017 z "
-       id="path3108"
-       inkscape:transform-center-y="-31.845711"
-       inkscape:transform-center-x="27.298337" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 286.59013,381.79328 L 328.89058,381.79328 L 336.58156,401.62413 L 327.60875,419.92957 L 286.59013,419.92957 L 296.20387,401.62413 L 286.59013,381.79328 z "
-       id="path3110" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3112"
-       transform="matrix(0.654898,0,0,0.869049,51.92158,201.8882)"><flowRegion
-         id="flowRegion3114"><rect
-           id="rect3116"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3120">WS</flowPara><flowPara
-         id="flowPara3124">Reference</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3128"
-       transform="matrix(0.654898,0,0,0.869049,112.0605,203.3723)"><flowRegion
-         id="flowRegion3130"><rect
-           id="rect3132"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3134">WS</flowPara><flowPara
-         id="flowPara3136">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3381"
-       width="115.66247"
-       height="85.862968"
-       x="376.54059"
-       y="229.73444"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3383"
-       transform="translate(113.9499,20.22444)"><flowRegion
-         id="flowRegion3385"><rect
-           id="rect3387"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3389">JAXB</flowPara><flowPara
-         id="flowPara3391">DefaultGreeter</flowPara><flowPara
-         id="flowPara3393">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 359.39009,261.5814 L 392.72513,261.5814 L 398.78604,274.71338 L 391.71498,286.83522 L 359.39009,286.83522 L 366.96624,274.71338 L 359.39009,261.5814 z "
-       id="path3395" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 472.64253,259.74312 L 505.97757,259.74312 L 512.03848,272.8751 L 504.96742,284.99694 L 472.64253,284.99694 L 480.21868,272.8751 L 472.64253,259.74312 z "
-       id="path3397" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3403"
-       width="115.66247"
-       height="85.862968"
-       x="375.19193"
-       y="355.69083"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3405"
-       transform="translate(112.6012,146.1808)"><flowRegion
-         id="flowRegion3407"><rect
-           id="rect3409"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3411">JAXB</flowPara><flowPara
-         id="flowPara3413">WSGreeter</flowPara><flowPara
-         id="flowPara3415">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 358.0414,387.53779 L 391.37644,387.53779 L 397.43735,400.66977 L 390.36629,412.79161 L 358.0414,412.79161 L 365.61755,400.66977 L 358.0414,387.53779 z "
-       id="path3417" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 471.29384,385.69951 L 504.62888,385.69951 L 510.68979,398.83149 L 503.61873,410.95333 L 471.29384,410.95333 L 478.86999,398.83149 L 471.29384,385.69951 z "
-       id="path3419" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 531.84342,380.87285 L 577.19603,380.87285 L 585.44194,401.43341 L 575.82171,420.41239 L 531.84342,420.41239 L 542.15084,401.43341 L 531.84342,380.87285 z "
-       id="path3421"
-       inkscape:transform-center-y="-31.845711"
-       inkscape:transform-center-x="27.298337" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 591.96241,382.27596 L 634.26286,382.27596 L 641.95384,402.10681 L 632.98103,420.41225 L 591.96241,420.41225 L 601.57615,402.10681 L 591.96241,382.27596 z "
-       id="path3423" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3425"
-       transform="matrix(0.654898,0,0,0.869049,357.2939,202.3709)"><flowRegion
-         id="flowRegion3427"><rect
-           id="rect3429"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3431">WS</flowPara><flowPara
-         id="flowPara3433">Reference</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3435"
-       transform="matrix(0.654898,0,0,0.869049,417.4328,203.855)"><flowRegion
-         id="flowRegion3437"><rect
-           id="rect3439"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3441">WS</flowPara><flowPara
-         id="flowPara3443">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 212.14286,274.09448 L 366.42857,274.80877"
-       id="path3447" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 512.14286,272.66591 L 599.28571,272.66591 L 599.28571,325.52305 L 665.71429,325.52305"
-       id="path3453" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 210.71429,399.80877 L 235.71429,399.80877"
-       id="path3455" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 278.57143,401.23734 L 295.71429,401.23734"
-       id="path3459" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 336.42857,401.95163 L 365.71429,401.95163"
-       id="path3461" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 510.71429,399.80877 L 540.71429,399.80877"
-       id="path3463" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 585,401.95163 L 600.71429,401.95163"
-       id="path3465" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 641.42857,402.66591 L 657.14286,402.66591 L 657.85714,339.09448 L 669.28571,339.09448"
-       id="path3467" />
-  </g>
-</svg>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop/pom.xml b/tags/java/sca/1.3-RC1a/itest/databindings/interop/pom.xml
deleted file mode 100644
index d593e1820f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop/pom.xml
+++ /dev/null
@@ -1,223 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-interop</artifactId>
-    <version>1.3</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA DataBinding Interop Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>itest-databindings-common</artifactId>
-                                    <version>${project.version}</version>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>
-                        <argument>${project.build.directory}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
deleted file mode 100644
index 7bdfc57924..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ /dev/null
@@ -1,113 +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 $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of 
- * bindings and a number of data types. 
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class InteropDatabindingTestCase extends TestCase  {
-
-    private static boolean initalised = false;
-    private GreeterService greeterClient;
-    private static SCADomain domain;
-
-    /**
-     * Runs before each test method
-     */
-    protected void setUp() throws Exception {
-        if (!initalised) {
-            domain = SCADomain.newInstance("interopgreeter.composite");
-            super.setUp();
-            initalised = true;
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    protected void tearDown() {
-
-    }
-
-    /**
-     * Finds the SCA component that relates to the protocol being tested. This test 
-     * always connects locally to the client component but the client component will
-     * connect to the back end component using the appropriate protocol
-     *
-     * @param ext the protcol required
-     */
-    private void setUpClient(String ext) throws Exception {
-        greeterClient = domain.getService(GreeterService.class, "SDO" + ext + "GreeterServiceClient");
-    }
-
-    /**
-     * Invokes the SDO Greet service using web service bindings with SDO payload
-     */
-    public void testWSGreet() throws Exception {
-        setUpClient("WS");
-        greet();
-    }
-
-    /**
-     * Invokes the SDO Greet service using default bindings with SDO payload
-     */
-    public void testDefaultGreet() throws Exception {
-        setUpClient("Default");
-        greet();
-    }
-
-    /**
-     * A generic method which, regarless of which client is connected, sends out a 
-     * series of requrests passing different data types. 
-     */
-    public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-        // test $typeInstance.getTypeName()
-        { 
-            $typeInstance.getTypeName() param = null;
-            $typeInstance.getCreateTypeCode()
-            $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
-            $typeInstance.getResultComparison()
-        }
-#end
-#end            
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
deleted file mode 100644
index 38bfccce0c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +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://apache.org/tuscany/sca/itest/databinding/services/jaxb"
-                  xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Greeter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
-#foreach($file in $fileList)
-            xmlns:$file.getPrefix()="$file.getNamespace()"
-#end        
-            targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" 
-            elementFormDefault="qualified">
-
-#foreach($file in $fileList)
-            <xsd:import namespace="$file.getNamespace()" 
-                        schemaLocation="../xsd/$file.getFileName()" />            
-#end 
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-            <element name="greet$typeInstance.getTypeName()">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" />
-                    </sequence>
-                </complexType>
-            </element>
-#end
-#end
-        </xsd:schema>
-    </wsdl:types>
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    <wsdl:message name="$typeInstance.getTypeName()Request">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="$typeInstance.getTypeName()Response">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-#end
-#end
-
-    <wsdl:portType name="GreeterPortType">
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" />
-            <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" />
-        </wsdl:operation>
-#end
-#end
-   </wsdl:portType>
-
-    <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="$typeInstance.getTypeName()RequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="$typeInstance.getTypeName()ResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-#end
-#end              
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterService">
-        <wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/JAXBGreeterServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
deleted file mode 100644
index 6f02af4c9d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +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://apache.org/tuscany/sca/itest/databinding/services/sdo"
-                  xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/sdo" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Greeter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
-#foreach($file in $fileList)
-            xmlns:$file.getPrefix()="$file.getNamespace()"
-#end        
-            targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/sdo" 
-            elementFormDefault="qualified">
-
-#foreach($file in $fileList)
-            <xsd:import namespace="$file.getNamespace()" 
-                        schemaLocation="../xsd/$file.getFileName()" />            
-#end 
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-            <element name="greet$typeInstance.getTypeName()">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" />
-                    </sequence>
-                </complexType>
-            </element>
-#end
-#end
-        </xsd:schema>
-    </wsdl:types>
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    <wsdl:message name="$typeInstance.getTypeName()Request">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="$typeInstance.getTypeName()Response">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-#end
-#end
-
-    <wsdl:portType name="GreeterPortType">
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" />
-            <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" />
-        </wsdl:operation>
-#end
-#end
-   </wsdl:portType>
-
-    <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="$typeInstance.getTypeName()RequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="$typeInstance.getTypeName()ResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-#end
-#end              
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterService">
-        <wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/SDOGreeterServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/generate.xml b/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8453dd56b4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,159 +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.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-                              
-  <Template>
-    <TemplateName>InteropDatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>interopgreeter.composite.vm</TemplateName>
-    <TemplateTargetDir>classes</TemplateTargetDir>
-  </Template>   
-  <Template>
-    <TemplateName>SDOGreeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <Template>
-    <TemplateName>JAXBGreeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template>
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage>
-    <Factory>TypesFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        TypesFactory factory = TypesFactory.INSTANCE;
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.interop</JavaPackage>  
-    <Factory>InteropFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix> 
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>          
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>           
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile> 
-</tns:Generate>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
deleted file mode 100644
index 36797fde57..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ /dev/null
@@ -1,78 +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://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-    name="InteropGreeterService">
-
-    <!-- SDO factory classes -->  
-    #foreach( $file in $fileList )
-    <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
-    #end   
-    
-    <!-- Default binding test -->
-    <component name="SDODefaultGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-        <reference name="greeterService" target="JAXBDefaultGreeterServiceClient"/>
-    </component> 
-        
-    <component name="JAXBDefaultGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
-        <reference name="greeterService" target="SDODefaultGreeterServiceComponent"/>
-    </component> 
-
-    <component name="SDODefaultGreeterServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
-    </component>
-
-    <!-- WS binding test -->
-    <component name="SDOWSGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-    </component>
-
-    <reference name="JAXBWSGreeterServiceReference" promote="SDOWSGreeterServiceClient/greeterService">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/>
-    </reference>  
-
-    <service name="JAXBWSGreeterService" promote="JAXBWSGreeterServiceClient">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/>
-    </service>
-
-    <component name="JAXBWSGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
-    </component>
-
-    <reference name="SDOWSGreeterServiceReference" promote="JAXBWSGreeterServiceClient/greeterService">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/>
-    </reference>  
-
-    <service name="SDOWSGreeterService" promote="SDOWSGreeterServiceComponent">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/>
-    </service>
-
-    <component name="SDOWSGreeterServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/pom.xml b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/pom.xml
deleted file mode 100644
index 2f06064421..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/pom.xml
+++ /dev/null
@@ -1,239 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>1.3</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Databinding Integration Tests - JAXB Bottom Up</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <!-- Added by Simon Nash    -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-
-                    <execution>
-                        <id>wsgen</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>wsgen-test</goal>
-                        </goals>
-                        <configuration>
-                            <sei>org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleImpl</sei>
-                            <genWsdl>true</genWsdl>
-                            <keep>true</keep>
-                            <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        </configuration>
-                    </execution>
-
-                </executions>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>com.sun</groupId>
-                        <artifactId>tools</artifactId>
-                        <version>1.5.0</version>
-                        <scope>system</scope>
-                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                    </dependency>
-                </dependencies>
-
-            </plugin>
-             -->
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
deleted file mode 100644
index 7529c2b841..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ /dev/null
@@ -1,63 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean1<T> {
-    private T item;
-    
-    public Bean1() {
-    }
-
-    public Bean1(T item) {
-        this.item = item;
-    }
-
-    public void setItem(T item) {
-        this.item = item;
-    }
-    
-    public T getItem() {
-        return item;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        if(that.getClass() != this.getClass()) {
-            return false;
-        }
-
-        Bean1<?> that1 = (Bean1<?>)that;
-        if(this == that1) {
-            return true;
-        } else if(this.item != null) {
-            return this.item.equals(that1.item);
-        } else {
-            return that1.item == null;
-        }
-    }
-    
-    public String toString() {
-        return this.getClass().getSimpleName()+"[item = "+item+"]";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
deleted file mode 100644
index 4a4419a42b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.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 org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean10 extends Bean1<String> {
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
deleted file mode 100644
index 65f019ec48..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.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 org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean11 extends Bean1<String> {
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
deleted file mode 100644
index 844e28863a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ /dev/null
@@ -1,56 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean2 {
-    private String name;
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        
-        if(this.getClass() != that.getClass()) {
-            return false;
-        }
-        
-        if(this == that) {
-            return true;
-        } else if(this.name != null) {
-            return this.name.equals(((Bean2)that).name);
-        } else {
-            return ((Bean2)that).name == null;
-        }
-    }
-    
-    public String toString() {
-        return this.getClass().getSimpleName()+"[name = "+name+"]";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
deleted file mode 100644
index 4e0bd38b2b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ /dev/null
@@ -1,56 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean3 extends Bean2 {
-    private String address;
-    
-    public void setAddress(String address) {
-        this.address = address;
-    }
-    
-    public String getAddress() {
-        return address;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        
-        if(this.getClass() != that.getClass()) {
-            return false;
-        }
-        
-        if(this == that) {
-            return true;
-        } else if(this.address != null) {
-            return this.address.equals(((Bean3)that).address) && super.equals(that);
-        } else {
-            return ((Bean3)that).address == null && super.equals(that);
-        }
-    }
-    
-    public String toString() {
-        return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
deleted file mode 100644
index 40aff31297..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ /dev/null
@@ -1,56 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean31 extends Bean2 {
-    private String address;
-    
-    public void setAddress(String address) {
-        this.address = address;
-    }
-    
-    public String getAddress() {
-        return address;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        
-        if(this.getClass() != that.getClass()) {
-            return false;
-        }
-        
-        if(this == that) {
-            return true;
-        } else if(this.address != null) {
-            return this.address.equals(((Bean31)that).address) && super.equals(that);
-        } else {
-            return ((Bean31)that).address == null && super.equals(that);
-        }
-    }
-
-    public String toString() {
-        return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
deleted file mode 100644
index ca012b967d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ /dev/null
@@ -1,42 +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.itest.databindings.jaxb;
-
-/**
- * The interface for GenericsLocalService.
- * 
- * @version $Rev$ $Date$
- */
-public interface GenericsLocalService {
-    Bean1<String> getTypeExplicit(Bean1<String> arg);
-    
-    <T> Bean1<T> getTypeUnbound(T[] anArray);
-    
-    <T extends Bean2> Bean1<T> getTypeExtends(T[] anArray);
-    
-    <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] anArray);
-    
-    Bean1<?> getWildcardUnbound(Bean1<?> arg);
-    
-    Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg);
-    
-    Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg);
-    
-    Bean2 getPolymorphic(Bean2 arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
deleted file mode 100644
index 12ed7d0ec7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ /dev/null
@@ -1,30 +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.itest.databindings.jaxb;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for GenericsService.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface GenericsService extends GenericsLocalService{
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
deleted file mode 100644
index 3bae554dc7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ /dev/null
@@ -1,43 +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.itest.databindings.jaxb;
-
-/**
- * The interface for GenericsServiceClient.
- * 
- * @version $Rev$ $Date$
- */
-public interface GenericsServiceClient {
-    Bean1<String> getTypeExplicitForward(Bean1<String> arg);
-
-    <T> Bean1<T> getTypeUnboundForward(T[] anArray);
-    
-    <T extends Bean2> Bean1<T> getTypeExtendsForward(T[] anArray);
-
-    <T extends Bean1<String>> Bean1<T> getRecursiveTypeBoundForward(T[] anArray);
-    
-    Bean1<?> getWildcardUnboundForward(Bean1<?> arg);
-    
-    Bean1<? super Bean3> getWildcardSuperForward(Bean1<? super Bean3> arg);
-    
-    Bean1<? extends Bean2> getWildcardExtendsForward(Bean1<? extends Bean2> arg);
-
-    Bean2 getPolymorphicForward(Bean2 arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
deleted file mode 100644
index 074ec85fce..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ /dev/null
@@ -1,57 +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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The interface for HelloLocalServiceSimple.
- */
-public interface HelloLocalServiceSimple {
-    String getGreetings(String name);
-    String[] getGreetingsArray(String[] names);
-    /**
-     * Add the RequestWrapper/ResponseWrapper annotations to support Collections.  These annotations are used
-     * by the remotable interface that extends this interface.
-     * @param names
-     * @return
-     */
-    List<String> getGreetingsList(List<String> names);
-    
-    /**
-     * Add the RequestWrapper/ResponseWrapper annotations to support Collections.  These annotations are used
-     * by the remotable interface that extends this interface.
-     * @param names
-     * @return
-     */
-    // @RequestWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsList")
-    // @ResponseWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsListResponse")
-    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
-    
-    // @WebMethod(exclude=true)
-    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
-    
-    // @WebMethod(exclude=true)
-    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
-    
-    String getGreetingsVarArgs(String... names);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
deleted file mode 100644
index 34ac9024f6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ /dev/null
@@ -1,29 +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.itest.databindings.jaxb;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for HelloServiceSimple.
- */
-@Remotable
-public interface HelloServiceSimple extends HelloLocalServiceSimple {
-    // Add any methods to the local interface.
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
deleted file mode 100644
index 23ed57dec9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.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 org.apache.tuscany.sca.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The interface for HelloServiceSimpleClient.
- */
-public interface HelloServiceSimpleClient {
-    String getGreetingsForward(String name);
-    String[] getGreetingsArrayForward(String[] names);
-    List<String> getGreetingsListForward(List<String> names);
-    ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names);
-    Map<String, String> getGreetingsMapForward(Map<String, String> namesMap);
-    HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap);
-    String getGreetingsVarArgsForward(String... names);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
deleted file mode 100644
index 6239c0f5f1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ /dev/null
@@ -1,47 +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.itest.databindings.jaxb;
-
-
-/**
- * The interface for PrimitivesLocalService.
- */
-public interface PrimitivesLocalService {
-    boolean negateBoolean(boolean flag);
-    boolean[] negateBooleanArray(boolean[] flags);
-    boolean[] identityBooleanArray(boolean[] flags);
-    byte negateByte(byte b);
-    byte[] negateByteArray(byte[] ba);
-    byte[] identityByteArray(byte[] ba);
-    short negateShort(short s);
-    short[] negateShortArray(short[] s);
-    short[] identityShortArray(short[] sa);
-    int negateInt(int s);
-    int[] negateIntArray(int[] s);
-    int[] identityIntArray(int[] ia);
-    long negateLong(long l);
-    long[] negateLongArray(long[] la);
-    long[] identityLongArray(long[] la);
-    float negateFloat(float f);
-    float[] negateFloatArray(float[] fa);
-    float[] identityFloatArray(float[] fa);
-    double negateDouble(double d);
-    double[] negateDoubleArray(double[] da);
-    double[] identityDoubleArray(double[] da);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
deleted file mode 100644
index c5553688e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ /dev/null
@@ -1,29 +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.itest.databindings.jaxb;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for PrimitivesService.
- */
-@Remotable
-public interface PrimitivesService extends PrimitivesLocalService {
-    // Add any methods to the local interface.
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
deleted file mode 100644
index 3bdf886dfa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.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 org.apache.tuscany.sca.itest.databindings.jaxb;
-
-
-/**
- * The interface for PrimitivesServiceClient.
- */
-public interface PrimitivesServiceClient {
-    boolean negateBooleanForward(boolean flag);
-    boolean[] negateBooleanArrayForward(boolean[] flags);
-    boolean passByValueBooleanArray();
-    byte negateByteForward(byte b);
-    byte[] negateByteArrayForward(byte[] ba);
-    boolean passByValueByteArray();
-    short negateShortForward(short s);
-    short[] negateShortArrayForward(short[] sa);
-    boolean passByValueShortArray();
-    int negateIntForward(int i);
-    int[] negateIntArrayForward(int[] ia);
-    boolean passByValueIntArray();
-    long negateLongForward(long l);
-    long[] negateLongArrayForward(long[] la);
-    boolean passByValueLongArray();
-    float negateFloatForward(float f);
-    float[] negateFloatArrayForward(float[] fa);
-    boolean passByValueFloatArray();
-    double negateDoubleForward(double d);
-    double[] negateDoubleArrayForward(double[] da);
-    boolean passByValueDoubleArray();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
deleted file mode 100644
index 0fdf69459f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ /dev/null
@@ -1,78 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-
-/**
- * The interface for StandardTypesLocalService.
- */
-public interface StandardTypesLocalService {
-    BigInteger getNewBigInteger(BigInteger bi);
-    BigInteger[] getNewBigIntegerArray(BigInteger[] bia);
-    
-    BigDecimal getNewBigDecimal(BigDecimal bd);
-    BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda);
-
-    Calendar getNewCalendar(Calendar c);
-    Calendar[] getNewCalendarArray(Calendar[] ca);
-    
-    Date getNewDate(Date d);
-    Date[] getNewDateArray(Date[] da);
-
-    QName getNewQName(QName qname);
-    QName[] getNewQNameArray(QName[] qnames);
-    
-    URI getNewURI(URI uri);
-    URI[] getNewURIArray(URI[] uris);
-    
-    XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal);
-    XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal);
-    
-    Duration getNewDuration(Duration d);
-    Duration[] getNewDurationArray(Duration[] da);
-    
-    Object getNewObject(Object obj);
-    Object[] getNewObjectArray(Object[] objs);
-    
-    Image getNewImage(Image img);
-    Image[] getNewImageArray(Image[] imgs);
-    
-    DataHandler getNewDataHandler(DataHandler dh);
-    DataHandler[] getNewDataHandlerArray(DataHandler[] dha);
-
-    Source getNewSource(Source src);
-    Source[] getNewSourceArray(Source[] srcs);
-    
-    UUID getNewUUID(UUID uuid);
-    UUID[] getNewUUIDArray(UUID[] uuids);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
deleted file mode 100644
index 2842205085..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ /dev/null
@@ -1,30 +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.itest.databindings.jaxb;
-
-import org.osoa.sca.annotations.Remotable;
-
-
-
-/**
- * The interface for StandardTypesService.
- */
-@Remotable
-public interface StandardTypesService extends StandardTypesLocalService{
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
deleted file mode 100644
index 351d9df0cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ /dev/null
@@ -1,79 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-
-/**
- * The interface for StandardTypesServiceClient.
- */
-public interface StandardTypesServiceClient {
-    BigInteger getNewBigIntegerForward(BigInteger bi);
-    BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia);
-
-    BigDecimal getNewBigDecimalForward(BigDecimal bd);
-    BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda);
-
-    Calendar getNewCalendarForward(Calendar c);
-    Calendar[] getNewCalendarArrayForward(Calendar[] ca);
-
-    Date getNewDateForward(Date d);
-    Date[] getNewDateArrayForward(Date[] da);
-
-    QName getNewQNameForward(QName qname);
-    QName[] getNewQNameArrayForward(QName[] qnames);
-
-    URI getNewURIForward(URI uri);
-    URI[] getNewURIArrayForward(URI[] uris);
-
-    XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal);
-    XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals);
-
-    Duration getNewDurationForward(Duration d);
-    Duration[] getNewDurationArrayForward(Duration[] da);
-
-    Object getNewObjectForward(Object obj);
-    Object[] getNewObjectArrayForward(Object[] objs);
-    
-    Image getNewImageForward(Image img);
-    Image[] getNewImageArrayForward(Image[] imgs);
-    
-    DataHandler getNewDataHandlerForward(DataHandler dh);
-    DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha);
-
-    Source getNewSourceForward(Source src);
-    Source[] getNewSourceArrayForward(Source[] srcs);
-
-    UUID getNewUUIDForward(UUID uuid);
-    UUID[] getNewUUIDArrayForward(UUID[] uuids);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
deleted file mode 100644
index 9e042ffe6a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of GenericsLocalServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- * 
- * @version $Rev$ $Date$
- */
-@Service(GenericsServiceClient.class)
-public class GenericsLocalServiceClientImpl implements GenericsServiceClient {
-
-    private GenericsLocalService service;
-
-    @Reference(required=false)
-    protected void setGenericsLocalService(GenericsLocalService service) {
-        this.service = service;
-    }
-
-    public Bean1<String> getTypeExplicitForward(Bean1<String> arg) {
-        return service.getTypeExplicit(arg);
-    }
-
-    public <T> Bean1<T> getTypeUnboundForward(T[] anArray) {
-        return service.getTypeUnbound(anArray);
-    }
-
-    public <T extends Bean2> Bean1<T> getTypeExtendsForward(T[] anArray) {
-        return service.getTypeExtends(anArray);
-    }
-
-    public <T extends Bean1<String>> Bean1<T> getRecursiveTypeBoundForward(T[] anArray) {
-        return service.getRecursiveTypeBound(anArray);
-    }
-
-    public Bean1<?> getWildcardUnboundForward(Bean1<?> arg) {
-        return service.getWildcardUnbound(arg);
-    }
-    
-    public Bean1<? super Bean3> getWildcardSuperForward(Bean1<? super Bean3> arg) {
-        return service.getWildcardSuper(arg);
-    }
-
-    public Bean1<? extends Bean2> getWildcardExtendsForward(Bean1<? extends Bean2> arg) {
-        return service.getWildcardExtends(arg);
-    }
-
-    public Bean2 getPolymorphicForward(Bean2 arg) {
-        return service.getPolymorphic(arg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
deleted file mode 100644
index ec929ddece..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ /dev/null
@@ -1,40 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of GenericsServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- * 
- * @version $Rev$ $Date$
- */
-@Service(GenericsServiceClient.class)
-public class GenericsServiceClientImpl extends GenericsLocalServiceClientImpl {
-
-    @Reference
-    public void setGenericsService(GenericsService service) {
-        super.setGenericsLocalService(service);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
deleted file mode 100644
index 58808eec4f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ /dev/null
@@ -1,69 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of GenericsService.
- * This implementation provides both a local and a remotable service.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces={GenericsService.class, GenericsLocalService.class})
-public class GenericsServiceImpl implements GenericsService, GenericsLocalService {
-
-    public Bean1<String> getTypeExplicit(Bean1<String> arg) {
-        return GenericsTransformer.getTypeExplicit(arg);
-    }
-
-    public <T> Bean1<T> getTypeUnbound(T[] anArray) {
-        return GenericsTransformer.getTypeUnbound(anArray);
-    }
-
-    public <T extends Bean2> Bean1<T> getTypeExtends(T[] anArray) {
-        return GenericsTransformer.getTypeExtends(anArray);
-    }
-
-    public <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] anArray) {
-        return GenericsTransformer.getRecursiveTypeBound(anArray);
-    }
-
-    public Bean1<?> getWildcardUnbound(Bean1<?> arg) {
-        return GenericsTransformer.getWildcardUnbound(arg);
-    }
-
-    public Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg) {
-        return GenericsTransformer.getWildcardSuper(arg);
-    }
-
-    public Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg) {
-        return GenericsTransformer.getWildcardExtends(arg);
-    }
-
-    public Bean2 getPolymorphic(Bean2 arg) {
-        return GenericsTransformer.getPolymorphic(arg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
deleted file mode 100644
index 858b8da59a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ /dev/null
@@ -1,125 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean10;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean11;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean31;
-
-
-/**
- * GenericsTransformer class that provide for transforming input provided to GenericsService methods.
- * 
- * @version $Rev$ $Date$
- */
-public class GenericsTransformer {
-    
-    public static Bean1<String> getTypeExplicit(Bean1<String> arg) {
-        return new Bean1<String>(arg.getItem() == null ? null : arg.getItem()+" AA");
-    }
-    
-    public static <T> Bean1<T> getTypeUnbound(T[] arg) {
-        if(arg instanceof String[]) {
-            return new Bean1<T>(arg[0]);
-        } else if(arg instanceof Integer[]){
-            return new Bean1<T>(arg[1]);
-        } else {
-            return new Bean1<T>(arg[2]);
-        }
-    }
-
-    public static <T extends Bean2> Bean1<T> getTypeExtends(T[] arg) {
-        if(arg instanceof Bean3[]) {
-            return new Bean1<T>(arg[0]);
-        } else if(arg instanceof Bean31[]) {
-            return new Bean1<T>(arg[1]);
-        } else {
-            return new Bean1<T>(arg[2]);
-        }
-    }
-
-    public static <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] arg) {
-        if(arg instanceof Bean10[]) {
-            return new Bean1<T>(arg[0]);
-        } else if(arg instanceof Bean11[]) {
-            return new Bean1<T>(arg[1]);
-        } else {
-            return new Bean1<T>(arg[2]);
-        }
-    }
-    
-    public static Bean1<?> getWildcardUnbound(Bean1<?> arg) {
-        if(arg.getItem() instanceof String) {
-            Bean1<String> temp = new Bean1<String>();
-            temp.setItem("Hello "+arg.getItem());
-            return temp;
-        } else if(arg.getItem() instanceof Integer) {
-            Bean1<Integer> temp = new Bean1<Integer>();
-            temp.setItem(10+(Integer)arg.getItem());
-            return temp;
-        } else {
-            return new Bean1<String>(arg.toString());
-        }
-    }
-    
-    public static Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg) {
-        Object item = arg.getItem();
-        if(item instanceof Bean3) {
-            Bean3 temp = new Bean3();
-            temp.setName("Hello " + ((Bean3)item).getName());
-            temp.setAddress("New "+((Bean3)item).getAddress());
-            return new Bean1<Bean3>(temp);
-        } else if(item instanceof Bean2) {
-            Bean2 temp = new Bean2();
-            temp.setName("Hello " + ((Bean3)item).getName());
-            return new Bean1<Bean2>(temp);
-        } else {
-            Bean2 temp = new Bean2();
-            temp.setName(item.toString());
-            return new Bean1<Bean2>(temp);
-        }
-    }
-
-    public static Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg) {
-        Bean2 item = arg.getItem();
-        if(item instanceof Bean3) {
-            Bean3 temp = new Bean3();
-            temp.setName("Hello "+item.getName());
-            temp.setAddress("New "+((Bean3)item).getAddress());
-            return new Bean1<Bean3>(temp);
-        } else if(item instanceof Bean31) {
-            Bean31 temp = new Bean31();
-            temp.setName("Hello "+item.getName());
-            temp.setAddress("New "+((Bean31)item).getAddress());
-            return new Bean1<Bean31>(temp);
-        } else {
-            Bean2 temp = new Bean2();
-            temp.setName("Hello "+item.getName());
-            return new Bean1<Bean2>(temp);
-        }
-    }
-    
-    public static Bean2 getPolymorphic(Bean2 arg) {
-        return arg;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
deleted file mode 100644
index 51e48edbc9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ /dev/null
@@ -1,73 +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.itest.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of HelloServiceSimpleClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(HelloServiceSimpleClient.class)
-public class HelloLocalServiceSimpleClientImpl implements HelloServiceSimpleClient {
-
-    private HelloLocalServiceSimple service;
-
-    @Reference(required=false)
-    protected void setHelloLocalServiceSimple(HelloLocalServiceSimple service) {
-        this.service = service;
-    }
-
-    public String getGreetingsForward(String name) {
-        return service.getGreetings(name);
-    }
-
-    public String[] getGreetingsArrayForward(String[] names) {
-        return service.getGreetingsArray(names);
-    }
-
-    public List<String> getGreetingsListForward(List<String> names) {
-        return service.getGreetingsList(names);
-    }
-
-    public Map<String, String> getGreetingsMapForward(Map<String, String> namesMap) {
-        return service.getGreetingsMap(namesMap);
-    }
-
-    public ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names) {
-        return service.getGreetingsArrayList(names);
-    }
-
-    public HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap) {
-        return service.getGreetingsHashMap(namesMap);
-    }
-
-    public String getGreetingsVarArgsForward(String... names) {
-        return service.getGreetingsVarArgs(names[0], names[1], names[2]);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
deleted file mode 100644
index de52cdfac3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.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 org.apache.tuscany.sca.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of HelloServiceSimpleClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(HelloServiceSimpleClient.class)
-public class HelloServiceSimpleClientImpl extends HelloLocalServiceSimpleClientImpl {
-
-    @Reference
-    public void setHelloServiceSimple(HelloServiceSimple service) {
-        super.setHelloLocalServiceSimple(service);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
deleted file mode 100644
index 3bceba1e92..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ /dev/null
@@ -1,112 +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.itest.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of HelloServiceSimple.
- * The implementation provides both a local and a remotable service.
- */
-@Service(interfaces = {HelloServiceSimple.class, HelloLocalServiceSimple.class})
-@WebService(targetNamespace = "http://jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class HelloServiceSimpleImpl implements HelloServiceSimple {
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public String getGreetings(@WebParam(name = "arg0", targetNamespace = "")
-    String name) {
-        return "Hello " + name;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public String[] getGreetingsArray(@WebParam(name = "arg0", targetNamespace = "")
-    String[] names) {
-        String[] resps = new String[names.length];
-        for (int i = 0; i < names.length; ++i) {
-            resps[i] = "Hello " + names[i];
-        }
-        return resps;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public List<String> getGreetingsList(@WebParam(name = "arg0", targetNamespace = "")
-    List<String> names) {
-        List<String> resps = new ArrayList<String>();
-        for (int i = 0; i < names.size(); ++i) {
-            resps.add("Hello " + names.get(i));
-        }
-        return resps;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public ArrayList<String> getGreetingsArrayList(@WebParam(name = "arg0", targetNamespace = "")
-    ArrayList<String> names) {
-        ArrayList<String> resps = new ArrayList<String>();
-        for (int i = 0; i < names.size(); ++i) {
-            resps.add("Hello " + names.get(i));
-        }
-        return resps;
-    }
-
-    //    @WebMethod
-    //    @WebResult(name = "return", targetNamespace = "")
-    public Map<String, String> getGreetingsMap(
-    // @WebParam(name = "arg0", targetNamespace = "")
-    Map<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public HashMap<String, String> getGreetingsHashMap(@WebParam(name = "arg0", targetNamespace = "")
-    HashMap<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    public String getGreetingsVarArgs(String... names) {
-        String resp = "Hello";
-        for(int i = 0; i < names.length; ++i) {
-            resp += (" "+names[i]);
-        }
-        return resp;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
deleted file mode 100644
index fe9121be9d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ /dev/null
@@ -1,138 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of PrimitivesLocalServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(PrimitivesServiceClient.class)
-public class PrimitivesLocalServiceClientImpl implements PrimitivesServiceClient {
-
-    private PrimitivesLocalService service;
-
-    @Reference(required=false)
-    protected void setPrimitivesLocalService(PrimitivesLocalService service) {
-        this.service = service;
-    }
-
-    public boolean negateBooleanForward(boolean flag) {
-        return service.negateBoolean(flag);
-    }
-    
-    public boolean[] negateBooleanArrayForward(boolean[] flags) {
-        return service.negateBooleanArray(flags);
-    }
-
-    public boolean passByValueBooleanArray() {
-        boolean[] req = new boolean[2];
-        boolean[] resp = service.identityBooleanArray(req);
-        return req != resp;
-    }
-    
-    public byte negateByteForward(byte b) {
-        return service.negateByte(b);
-    }
-    
-    public byte[] negateByteArrayForward(byte[] ba) {
-        return service.negateByteArray(ba);
-    }
-
-    public boolean passByValueByteArray() {
-        byte[] req = new byte[2];
-        byte[] resp = service.identityByteArray(req);
-        return req != resp;
-    }
-    
-    public short negateShortForward(short s) {
-        return service.negateShort(s);
-    }
-    
-    public short[] negateShortArrayForward(short[] s) {
-        return service.negateShortArray(s);
-    }
-
-    public boolean passByValueShortArray() {
-        short[] req = new short[2];
-        short[] resp = service.identityShortArray(req);
-        return req != resp;
-    }
-    
-    public int negateIntForward(int i) {
-        return service.negateInt(i);
-    }
-    
-    public int[] negateIntArrayForward(int[] ia) {
-        return service.negateIntArray(ia);
-    }
-
-    public boolean passByValueIntArray() {
-        int[] req = new int[2];
-        int[] resp = service.identityIntArray(req);
-        return req != resp;
-    }
-    
-    public long negateLongForward(long l) {
-        return service.negateLong(l);
-    }
-    
-    public long[] negateLongArrayForward(long[] la) {
-        return service.negateLongArray(la);
-    }
-
-    public boolean passByValueLongArray() {
-        long[] req = new long[2];
-        long[] resp = service.identityLongArray(req);
-        return req != resp;
-    }
-    
-    public float negateFloatForward(float f) {
-        return service.negateFloat(f);
-    }
-    
-    public float[] negateFloatArrayForward(float[] fa) {
-        return service.negateFloatArray(fa);
-    }
-
-    public boolean passByValueFloatArray() {
-        float[] req = new float[2];
-        float[] resp = service.identityFloatArray(req);
-        return req != resp;
-    }
-    
-    public double negateDoubleForward(double d) {
-        return service.negateDouble(d);
-    }
-    
-    public double[] negateDoubleArrayForward(double[] da) {
-        return service.negateDoubleArray(da);
-    }
-
-    public boolean passByValueDoubleArray() {
-        double[] req = new double[2];
-        double[] resp = service.identityDoubleArray(req);
-        return req != resp;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
deleted file mode 100644
index 28ace6aab7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.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 org.apache.tuscany.sca.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of PrimitivesServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(PrimitivesServiceClient.class)
-public class PrimitivesServiceClientImpl extends PrimitivesLocalServiceClientImpl {
-
-    @Reference
-    public void setPrimitivesService(PrimitivesService service) {
-        super.setPrimitivesLocalService(service);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
deleted file mode 100644
index ab1a3b4ab8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ /dev/null
@@ -1,151 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of PrimitivesService.
- * This implementation provides both a local and a remotable service.
- */
-@Service(interfaces={PrimitivesService.class, PrimitivesLocalService.class})
-public class PrimitivesServiceImpl implements PrimitivesService, PrimitivesLocalService {
-
-    public boolean negateBoolean(boolean flag) {
-        return !flag;
-    }
-
-    public boolean[] negateBooleanArray(boolean[] flags) {
-        boolean[] resp = new boolean[flags.length];
-        
-        for(int i = 0; i < flags.length; ++i) {
-            resp[i] = !flags[i];
-        }
-        return resp;
-    }
-    
-    public boolean[] identityBooleanArray(boolean[] flags) {
-        return flags;
-    }
-    
-    public byte negateByte(byte b) {
-        return (byte)-b;
-    }
-
-    public byte[] negateByteArray(byte[] ba) {
-        byte[] resp = new byte[ba.length];
-        
-        for(int i = 0; i < ba.length; ++i) {
-            resp[i] = (byte)-ba[i];
-        }
-        return resp;
-    }
-    
-    public byte[] identityByteArray(byte[] ba) {
-        return ba;
-    }
-    
-    public short negateShort(short s) {
-        return (short)-s;
-    }
-
-    public short[] negateShortArray(short[] s) {
-        short[] resp = new short[s.length];
-        
-        for(int i = 0; i < s.length; ++i) {
-            resp[i] = (short)-s[i];
-        }
-        return resp;
-    }
-    
-    public short[] identityShortArray(short[] sa) {
-        return sa;
-    }
-
-    public int negateInt(int i) {
-        return -i;
-    }
-
-    public int[] negateIntArray(int[] ia) {
-        int[] resp = new int[ia.length];
-        
-        for(int i = 0; i < ia.length; ++i) {
-            resp[i] = -ia[i];
-        }
-        return resp;
-    }
-
-    public int[] identityIntArray(int[] ia) {
-        return ia;
-    }
-    
-    public long negateLong(long l) {
-        return -l;
-    }
-
-    public long[] negateLongArray(long[] la) {
-        long[] resp = new long[la.length];
-        
-        for(int i = 0; i < la.length; ++i) {
-            resp[i] = -la[i];
-        }
-        return resp;
-    }
-    
-    public long[] identityLongArray(long[] la) {
-        return la;
-    }
-    
-    public float negateFloat(float f) {
-        return -f;
-    }
-
-    public float[] negateFloatArray(float[] fa) {
-        float[] resp = new float[fa.length];
-        
-        for(int i = 0; i < fa.length; ++i) {
-            resp[i] = -fa[i];
-        }
-        return resp;
-    }
-    
-    public float[] identityFloatArray(float[] fa) {
-        return fa;
-    }
-    
-    public double negateDouble(double d) {
-        return -d;
-    }
-
-    public double[] negateDoubleArray(double[] da) {
-        double[] resp = new double[da.length];
-        
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = -da[i];
-        }
-        return resp;
-    }
-    
-    public double[] identityDoubleArray(double[] da) {
-        return da;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
deleted file mode 100644
index 0a8f6772b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ /dev/null
@@ -1,157 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of StandardTypesLocalServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(StandardTypesServiceClient.class)
-public class StandardTypesLocalServiceClientImpl implements StandardTypesServiceClient {
-
-    private StandardTypesLocalService service;
-
-    @Reference(required=false)
-    protected void setStandardTypesLocalService(StandardTypesLocalService service) {
-        this.service = service;
-    }
-
-    public BigInteger getNewBigIntegerForward(BigInteger bi) {
-        return service.getNewBigInteger(bi);
-    }
-
-    public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) {
-        return service.getNewBigIntegerArray(bia);
-    }
-
-    public BigDecimal getNewBigDecimalForward(BigDecimal bd) {
-        return service.getNewBigDecimal(bd);
-    }
-
-    public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) {
-        return service.getNewBigDecimalArray(bda);
-    }
-    public Calendar getNewCalendarForward(Calendar c) {
-        return service.getNewCalendar(c);
-    }
-    public Calendar[] getNewCalendarArrayForward(Calendar[] ca) {
-        return service.getNewCalendarArray(ca);
-    }
-
-    public Date getNewDateForward(Date d) {
-        return service.getNewDate(d);
-    }
-
-    public Date[] getNewDateArrayForward(Date[] da) {
-        return service.getNewDateArray(da);
-    }
-
-    public QName getNewQNameForward(QName qname) {
-        return service.getNewQName(qname);
-    }
-
-    public QName[] getNewQNameArrayForward(QName[] qnames) {
-        return service.getNewQNameArray(qnames);        
-    }
-
-    public URI getNewURIForward(URI uri) {
-        return service.getNewURI(uri);
-    }
-
-    public URI[] getNewURIArrayForward(URI[] uris) {
-        return service.getNewURIArray(uris);
-    }
-
-    public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) {
-        return service.getNewXMLGregorianCalendar(xgcal);
-    }
-
-    public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) {
-        return service.getNewXMLGregorianCalendarArray(xgcals);
-    }
-
-    public Duration getNewDurationForward(Duration d) {
-        return service.getNewDuration(d);
-    }
-
-    public Duration[] getNewDurationArrayForward(Duration[] da) {
-        return service.getNewDurationArray(da);
-    }
-
-    public Object getNewObjectForward(Object obj) {
-        return service.getNewObject(obj);
-    }
-
-    public Object[] getNewObjectArrayForward(Object[] objs) {
-        return service.getNewObjectArray(objs);
-    }
-    
-    public Image getNewImageForward(Image img) {
-        return service.getNewImage(img);
-    }
-
-    public Image[] getNewImageArrayForward(Image[] imgs) {
-        return service.getNewImageArray(imgs);
-    }
-
-    public DataHandler getNewDataHandlerForward(DataHandler dh) {
-        return service.getNewDataHandler(dh);
-    }
-
-    public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) {
-        return service.getNewDataHandlerArray(dha);
-    }
-
-    
-    public Source getNewSourceForward(Source src) {
-        return service.getNewSource(src);
-    }
-
-    public Source[] getNewSourceArrayForward(Source[] srcs) {
-        return service.getNewSourceArray(srcs);
-    }
-    
-    public UUID getNewUUIDForward(UUID uuid) {
-        return service.getNewUUID(uuid);
-    }
-
-    public UUID[] getNewUUIDArrayForward(UUID[] uuids) {
-        return service.getNewUUIDArray(uuids);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
deleted file mode 100644
index 626b0e9844..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.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 org.apache.tuscany.sca.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of StandardTypesServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(StandardTypesServiceClient.class)
-public class StandardTypesServiceClientImpl extends StandardTypesLocalServiceClientImpl {
-
-    @Reference
-    public void setStandardTypesService(StandardTypesService service) {
-        super.setStandardTypesLocalService(service);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
deleted file mode 100644
index 19a6cae01b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ /dev/null
@@ -1,208 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of StandardTypesService.
- * This implementation provides both a local and a remotable service.
- */
-@Service(interfaces={StandardTypesService.class, StandardTypesLocalService.class})
-public class StandardTypesServiceImpl implements StandardTypesService, StandardTypesLocalService {
-
-    public BigInteger getNewBigInteger(BigInteger bi) {
-        return bi.negate();
-    }
-
-    public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) {
-        BigInteger[] resp = new BigInteger[bia.length];
-        for(int i = 0; i < bia.length; ++i) {
-            resp[i] = bia[i].negate();
-        }
-        return resp;
-    }
-
-    public BigDecimal getNewBigDecimal(BigDecimal bd) {
-        return bd.negate();
-    }
-
-    public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) {
-        BigDecimal[] resp = new BigDecimal[bda.length];
-        for(int i = 0; i < bda.length; ++i) {
-            resp[i] = bda[i].negate();
-        }
-        return resp;
-    }
-
-    public Calendar getNewCalendar(Calendar c) {
-        Calendar resp = (Calendar)c.clone();
-        resp.add(Calendar.DAY_OF_MONTH, 5);
-        return resp;
-    }
-
-    public Calendar[] getNewCalendarArray(Calendar[] ca) {
-        Calendar[] resp = new Calendar[ca.length];
-        for(int i = 0; i < ca.length; ++i) {
-            resp[i] = getNewCalendar(ca[i]);
-        }
-        return resp;
-    }
-
-    public Date getNewDate(Date d) {
-        return new Date(d.getTime() + 5*24*60*60*1000);
-    }
-
-    public Date[] getNewDateArray(Date[] da) {
-        Date[] resp = new Date[da.length];
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = getNewDate(da[i]);
-        }
-        return resp;
-    }
-
-    public QName getNewQName(QName qname) {
-        return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q");
-        
-    }
-
-    public QName[] getNewQNameArray(QName[] qnames) {
-        QName[] resp = new QName[qnames.length];
-        for(int i = 0; i < qnames.length; ++i) {
-            resp[i] = getNewQName(qnames[i]);
-        }
-        return resp;
-    }
-
-    public URI getNewURI(URI uri) {
-        return uri.resolve("uri");
-    }
-
-    public URI[] getNewURIArray(URI[] uris) {
-        URI[] resp = new URI[uris.length];
-        for(int i = 0; i < uris.length; ++i) {
-            resp[i] = getNewURI(uris[i]);
-        }
-        return resp;
-    }
-
-    public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) {
-        xgcal = (XMLGregorianCalendar)xgcal.clone();
-        xgcal.setDay(xgcal.getDay()+5);
-        return xgcal;
-    }
-
-    public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) {
-        XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length];
-        for(int i = 0; i < xgcals.length; ++i) {
-            resp[i] = getNewXMLGregorianCalendar(xgcals[i]);
-        }
-        return resp;
-    }
-
-    public Duration getNewDuration(Duration d) {
-        return d.negate();
-    }
-
-    public Duration[] getNewDurationArray(Duration[] da) {
-        Duration[] resp = new Duration[da.length];
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = da[i].negate();
-        }
-        return resp;
-    }
-
-    public Object getNewObject(Object obj) {
-        return StandardTypesTransformer.getNewObject(obj);
-    }
-
-    public Object[] getNewObjectArray(Object[] objs) {
-        Object[] resp = new Object[objs.length];
-        for(int i = 0; i < objs.length; ++i) {
-            resp[i] = getNewObject(objs[i]);
-        }
-        return resp;
-    }
-
-    public Image getNewImage(Image img) {
-        return StandardTypesTransformer.getNewImage(img);
-    }
-
-    public Image[] getNewImageArray(Image[] imgs) {
-        Image[] resp = new Image[imgs.length];
-        for(int i = 0; i < imgs.length; ++i) {
-            resp[i] = getNewImage(imgs[i]);
-        }
-        return resp;
-    }
-
-    public DataHandler getNewDataHandler(DataHandler dh) {
-        // FIXME: transform the input
-        return dh;
-    }
-
-    public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) {
-        DataHandler[] resp = new DataHandler[dha.length];
-        for(int i = 0; i < dha.length; ++i) {
-            resp[i] = dha[i];
-        }
-        return resp;
-    }
-    
-    public Source getNewSource(Source src) {
-        return StandardTypesTransformer.getNewSource(src);
-    }
-
-    public Source[] getNewSourceArray(Source[] srcs) {
-        Source[] resp = new Source[srcs.length];
-        for(int i = 0; i < srcs.length; ++i) {
-            resp[i] = getNewSource(srcs[i]);
-        }
-        return resp;
-    }
-
-    public UUID getNewUUID(UUID uuid) {
-        return UUID.fromString(uuid.toString()+"AAA");
-    }
-
-    public UUID[] getNewUUIDArray(UUID[] uuids) {
-        UUID[] resp = new UUID[uuids.length];
-        for(int i = 0; i < uuids.length; ++i) {
-            resp[i] = getNewUUID(uuids[i]);
-        }
-        return resp;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
deleted file mode 100644
index 68510b4b03..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ /dev/null
@@ -1,144 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayReader;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-
-import org.xml.sax.InputSource;
-
-
-
-/**
- * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods.
- * 
- * @version $Rev$ $Date$
- */
-public class StandardTypesTransformer {
-    
-    public static Object getNewObject(Object obj) {
-        if(obj instanceof String) {
-            return "Hello "+obj;
-        } else if(obj instanceof Integer) {
-            return new Integer(-((Integer)obj).intValue());
-        } else if(obj instanceof Double) {
-            return new Double(-((Double)obj).doubleValue());
-        }
-        
-        return obj;
-    }
-    
-    /**
-     * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource.
-     * Returns the input object as is for other types.
-     */
-    public static Source getNewSource(Source src) {
-        Source ret = null;
-        if(src instanceof DOMSource) {
-            DOMSource dsrc = (DOMSource)src;
-            ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null);
-        } else if(src instanceof SAXSource) {
-            SAXSource ssrc = (SAXSource)src;
-            if(ssrc.getInputSource().getByteStream() != null) {
-                InputStream inp = ssrc.getInputSource().getByteStream();
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                int b;
-                try {
-                    while((b = inp.read()) != -1) {
-                        bout.write(b);
-                    }
-                } catch (IOException ignored) {
-                }
-                try { bout.close();} catch (IOException ignored) {}
-                try { inp.reset();} catch (IOException ignored) {}
-                ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray())));
-            } else if(ssrc.getInputSource().getCharacterStream() != null) {
-                Reader rdr = ssrc.getInputSource().getCharacterStream();
-                CharArrayWriter caw = new CharArrayWriter();
-                try {
-                    int c;
-                    while((c = rdr.read()) != -1) {
-                        caw.append((char)c);
-                    }
-                } catch (IOException ignored) {
-                }
-                caw.close();
-                try{ rdr.reset();} catch(IOException ignored) {}
-                ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray())));
-            } else {
-                ret = new SAXSource();
-            }
-        } else if(src instanceof StreamSource) {
-            StreamSource ssrc = (StreamSource)src;
-            if(ssrc.getInputStream() != null) {
-                InputStream inp = ssrc.getInputStream();
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                int b;
-                try {
-                    while((b = inp.read()) != -1) {
-                        bout.write(b);
-                    }
-                } catch (IOException ignored) {
-                }
-                try { bout.close();} catch (IOException ignored) {}
-                try { inp.reset();} catch (IOException ignored) {}
-                ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
-            } else if(ssrc.getReader() != null) {
-                Reader rdr = ssrc.getReader();
-                CharArrayWriter caw = new CharArrayWriter();
-                try {
-                    int c;
-                    while((c = rdr.read()) != -1) {
-                        caw.append((char)c);
-                    }
-                } catch (IOException ignored) {
-                }
-                caw.close();
-                try{ rdr.reset();} catch(IOException ignored) {}
-                ret = new StreamSource(new CharArrayReader(caw.toCharArray()));
-            } else {
-                ret = new StreamSource();
-            }
-        }
-        
-        if(ret != null) {
-            ret.setSystemId(src.getSystemId());
-        } else {
-            ret = src;
-        }
-        return ret;
-    }
-    
-    public static Image getNewImage(Image arg) {
-        arg.getGraphics().drawOval(2, 2, 7, 7);
-        return arg;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java
deleted file mode 100644
index c8d08eed85..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.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 org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * This wrapper class was initially generated by wsgen.
- * 
- * @version $Rev$ $Date$
- */
-@XmlRootElement(name = "getGreetingsList", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getGreetingsList", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class GetGreetingsList {
-
-    @XmlElement(name = "arg0", namespace = "")
-    private List<String> arg0;
-
-    /**
-     * 
-     * @return
-     *     returns List<String>
-     */
-    public List<String> getArg0() {
-        return this.arg0;
-    }
-
-    /**
-     * 
-     * @param arg0
-     *     the value for the arg0 property
-     */
-    public void setArg0(List<String> arg0) {
-        this.arg0 = arg0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java
deleted file mode 100644
index 17ca0ca596..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.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 org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * This wrapper class was initially generated by wsgen.
- * 
- * @version $Rev$ $Date$
- */
-@XmlRootElement(name = "getGreetingsListResponse", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getGreetingsListResponse", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class GetGreetingsListResponse {
-
-    @XmlElement(name = "return", namespace = "")
-    private List<String> _return;
-
-    /**
-     * 
-     * @return
-     *     returns List<String>
-     */
-    public List<String> getReturn() {
-        return this._return;
-    }
-
-    /**
-     * 
-     * @param _return
-     *     the value for the _return property
-     */
-    public void setReturn(List<String> _return) {
-        this._return = _return;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
deleted file mode 100644
index 2d47ba7b14..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ /dev/null
@@ -1,69 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-           name="GenericsService">
-           
-    <!-- Clients to test the service -->
-    <!-- A GenericsServiceClient component that uses WS binding to invoke GenericsService -->
-    <component name="GenericsServiceClientWSComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" />
-        <reference name="genericsService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
-            <binding.ws uri="http://localhost:8085/gs-ep"/>
-        </reference>
-    </component>
-
-    <!-- A GenericsServiceClient component that uses SCA binding to invoke GenericsService service -->
-    <component name="GenericsServiceClientSCAComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" />
-        <reference name="genericsService" target="GenericsServiceComponent/GenericsService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
-            <binding.sca/>
-        </reference>
-    </component>
-    
-    <!-- A GenericsLocalServiceClient component that uses SCA binding to invoke GenericsLocalService service -->
-    <component name="GenericsLocalServiceClientSCAComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsLocalServiceClientImpl" />
-        <reference name="genericsLocalService" target="GenericsServiceComponent/GenericsLocalService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService"/>
-            <binding.sca/>
-        </reference>
-    </component>
-
-    <!-- Components used to implement the services -->
-    <!-- A GenericsService component. -->
-    <component name="GenericsServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceImpl"/>
-        <service name="GenericsService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
-            <binding.ws uri="http://localhost:8085/gs-ep"/>
-            <binding.sca/>
-        </service>
-        <service name="GenericsLocalService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService"/>
-            <binding.sca/>
-        </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
deleted file mode 100644
index c39cf21002..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ /dev/null
@@ -1,65 +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://www.osoa.org/xmlns/sca/1.0" 

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="HelloService">

-           

-    <!-- Clients to test the service -->

-    <!-- A HelloServiceSimpleClient component that uses WS binding to invoke HelloServiceSimple service -->

-    <component name="HelloServiceSimpleClientWSComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />

-        <reference name="helloServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>

-            <binding.ws uri="http://localhost:8085/hs-ep0"/>

-        </reference>

-    </component>

-

-    <!-- A HelloServiceSimpleClient component that uses SCA binding to invoke HelloServiceSimple service -->

-    <component name="HelloServiceSimpleClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />

-        <reference name="helloServiceSimple" target="HelloServiceSimpleComponent/HelloServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>

-            <binding.sca/>

-        </reference>

-    </component>

-    

-    <!-- A HelloLocalServiceSimpleClient component that uses SCA binding to invoke HelloLocalServiceSimple service -->

-    <component name="HelloLocalServiceSimpleClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloLocalServiceSimpleClientImpl" />

-        <reference name="helloLocalServiceSimple" target="HelloServiceSimpleComponent/HelloLocalServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple"/>

-            <binding.sca/>

-        </reference>

-    </component>

-

-    <!-- Components used to implement the services -->

-    <!-- A HelloServiceSimple component. -->

-    <component name="HelloServiceSimpleComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleImpl"/>

-        <service name="HelloServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>

-            <binding.ws uri="http://localhost:8085/hs-ep0"/>

-            <binding.sca/>

-        </service>

-        <service name="HelloLocalServiceSimple">

-            <binding.sca/>

-        </service>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
deleted file mode 100644
index 4b0a6e215d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ /dev/null
@@ -1,66 +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://www.osoa.org/xmlns/sca/1.0" 

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="PrimitivesService">

-           

-    <!-- Clients to test the service -->

-    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService -->

-    <component name="PrimitivesServiceClientWSComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />

-        <reference name="primitivesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>

-            <binding.ws uri="http://localhost:8085/ps-ep"/>

-        </reference>

-    </component>

-

-    <!-- A PrimitivesServiceClient component that uses SCA binding to invoke PrimitivesService service -->

-    <component name="PrimitivesServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />

-        <reference name="primitivesService" target="PrimitivesServiceComponent/PrimitivesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-    

-    <!-- A PrimitivesLocalServiceClient component that uses SCA binding to invoke PrimitivesLocalService service -->

-    <component name="PrimitivesLocalServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesLocalServiceClientImpl" />

-        <reference name="primitivesLocalService" target="PrimitivesServiceComponent/PrimitivesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-

-    <!-- Components used to implement the services -->

-    <!-- A PrimitivesService component. -->

-    <component name="PrimitivesServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>

-        <service name="PrimitivesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>

-            <binding.ws uri="http://localhost:8085/ps-ep"/>

-            <binding.sca/>

-        </service>

-        <service name="PrimitivesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService"/>

-            <binding.sca/>

-        </service>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
deleted file mode 100644
index 13ef73c082..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ /dev/null
@@ -1,66 +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://www.osoa.org/xmlns/sca/1.0" 

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="StandardTypesService">

-           

-    <!-- Clients to test the service -->

-    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService -->

-    <component name="StandardTypesServiceClientWSComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />

-        <reference name="standardTypesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>

-            <binding.ws uri="http://localhost:8085/sts-ep"/>

-        </reference>

-    </component>

-

-    <!-- A StandardTypesServiceClient component that uses SCA binding to invoke StandardTypesService service -->

-    <component name="StandardTypesServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />

-        <reference name="standardTypesService" target="StandardTypesServiceComponent/StandardTypesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-    

-    <!-- A StandardTypesLocalServiceClient component that uses SCA binding to invoke StandardTypesLocalService service -->

-    <component name="StandardTypesLocalServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesLocalServiceClientImpl" />

-        <reference name="standardTypesLocalService" target="StandardTypesServiceComponent/StandardTypesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-

-    <!-- Components used to implement the services -->

-    <!-- A StandardTypesService component. -->

-    <component name="StandardTypesServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>

-        <service name="StandardTypesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>

-            <binding.ws uri="http://localhost:8085/sts-ep"/>

-            <binding.sca/>

-        </service>

-        <service name="StandardTypesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService"/>

-            <binding.sca/>

-        </service>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
deleted file mode 100644
index 4967b896a5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ /dev/null
@@ -1,339 +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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DatabindingTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs once before running the tests
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try { 
-            domain = SCADomain.newInstance("helloservice.composite");
-        } catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs once after running the tests
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testSCA() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTest(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testSCAArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestArray(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testSCAList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testSCAArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestArrayList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testSCAMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testSCAHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestHashMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testSCAVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestVarArgs(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testWS() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTest(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testWSArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestArray(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testWSList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testWSArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestArrayList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testWSMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testWSHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestHashMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testWSVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestVarArgs(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testSCALocal() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTest(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testSCALocalArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestArray(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testSCALocalList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testSCALocalArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestArrayList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testSCALocalMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testSCALocalHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestHashMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testSCALocalVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestVarArgs(helloServiceSimpleClient);
-    }
-
-    private void performTest(HelloServiceSimpleClient helloServiceSimpleClient) {
-        String name = "Pandu";
-        String resp = helloServiceSimpleClient.getGreetingsForward(name);
-        Assert.assertEquals("Hello "+name, resp);
-    }
-
-    private void performTestArray(HelloServiceSimpleClient helloServiceSimpleClient) {
-        String[] names = {"Me", "Pandu"};
-        String[] resps = helloServiceSimpleClient.getGreetingsArrayForward(names);
-        for(int i = 0; i < names.length; ++i) {
-            Assert.assertEquals("Hello "+names[i], resps[i]);
-        }
-    }
-
-    private void performTestList(HelloServiceSimpleClient helloServiceSimpleClient) {
-        List<String> namesList = new ArrayList<String>();
-        namesList.add("Me");
-        namesList.add("Pandu");
-        namesList.add("Chinnipandu");
-        List<String> respList = helloServiceSimpleClient.getGreetingsListForward(namesList);
-        Assert.assertEquals(namesList.size(), respList.size());
-        for(int i = 0; i < namesList.size(); ++i) {
-            Assert.assertEquals("Hello "+namesList.get(i), respList.get(i));
-        }
-    }
-
-    private void performTestArrayList(HelloServiceSimpleClient helloServiceSimpleClient) {
-        ArrayList<String> namesList = new ArrayList<String>();
-        namesList.add("Me");
-        namesList.add("Pandu");
-        namesList.add("Chinnipandu");
-        ArrayList<String> respList = helloServiceSimpleClient.getGreetingsArrayListForward(namesList);
-        Assert.assertEquals(namesList.size(), respList.size());
-        for(int i = 0; i < namesList.size(); ++i) {
-            Assert.assertEquals("Hello "+namesList.get(i), respList.get(i));
-        }
-    }
-
-    private void performTestMap(HelloServiceSimpleClient helloServiceSimpleClient) {
-        Map<String, String> namesMap = new HashMap<String, String>();
-        namesMap.put("Me", null);
-        namesMap.put("Pandu", null);
-        namesMap.put("Chinnipandu", null);
-        Map<String, String> respMap = helloServiceSimpleClient.getGreetingsMapForward(namesMap);
-        Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size());
-        for(Map.Entry<String, String> entry: namesMap.entrySet()) {
-            Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey()));
-        }
-    }
-
-    private void performTestHashMap(HelloServiceSimpleClient helloServiceSimpleClient) {
-        HashMap<String, String> namesMap = new HashMap<String, String>();
-        namesMap.put("Me", null);
-        namesMap.put("Pandu", null);
-        namesMap.put("Chinnipandu", null);
-        Map<String, String> respMap = helloServiceSimpleClient.getGreetingsHashMapForward(namesMap);
-        Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size());
-        for(Map.Entry<String, String> entry: namesMap.entrySet()) {
-            Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey()));
-        }
-    }
-
-    private void performTestVarArgs(HelloServiceSimpleClient helloServiceSimpleClient) {
-        String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3.
-        String expected = "Hello Me You Pandu";
-        String actual = helloServiceSimpleClient.getGreetingsVarArgsForward(names[0], names[1], names[2]);
-        Assert.assertEquals(expected, actual);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
deleted file mode 100644
index c22d00140e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ /dev/null
@@ -1,484 +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.itest.databindings.jaxb;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsTransformer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Databinding tests for generics, parameterized and polymorphic types.
- * 
- * @version $Rev$ $Date$
- */
-public class GenericsDatabindingTestCase {
-    private static SCADomain domain;
- 
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try { 
-            domain = SCADomain.newInstance("generics-service.composite");
-        } catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getTypeExplicit.
-     */
-    @Test
-    public void testSCATypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestTypeExplicit(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getTypeUnbound.
-     */
-    @Test
-    public void testSCATypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestTypeUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getTypeExtends.
-     */
-    @Test
-    public void testSCATypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestTypeExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getRecursiveTypeBound.
-     */
-    @Test
-    public void testSCARecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestRecursiveTypeBound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getWildcardUnbound.
-     */
-    @Test
-    public void testSCAWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestWildcardUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getWildcardSuper.
-     */
-    @Test
-    public void testSCAWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestWildcardSuper(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getWildcardExtends.
-     */
-    @Test
-    public void testSCAWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestWildcardExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getPolymorphic.
-     */
-    @Test
-    public void testSCAPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestPolymorphic(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getTypeExplicit.
-     */
-    @Test
-    public void testWSTypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestTypeExplicit(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getTypeUnbound.
-     */
-    @Test
-    public void testWSTypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestTypeUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getTypeExtends.
-     */
-    @Test
-    public void testWSTypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestTypeExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getRecursiveTypeBound.
-     */
-    @Test
-    public void testWSRecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestRecursiveTypeBound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getWildcardUnbound.
-     */
-    @Test
-    public void testWSWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestWildcardUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getWildcardSuper.
-     */
-    @Test
-    public void testWSWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestWildcardSuper(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getWildcardExtends.
-     */
-    @Test
-    public void testWSWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestWildcardExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getPolymorphic.
-     */
-    @Test
-    public void testWSPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestPolymorphic(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getTypeExplicit.
-     */
-    @Test
-    public void testSCALocalTypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestTypeExplicit(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getTypeUnbound.
-     */
-    @Test
-    public void testSCALocalTypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestTypeUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getTypeExtends.
-     */
-    @Test
-    public void testSCALocalTypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestTypeExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getRecursiveTypeBound.
-     */
-    @Test
-    public void testSCALocalRecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestRecursiveTypeBound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getWildcardUnbound.
-     */
-    @Test
-    public void testSCALocalWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestWildcardUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getWildcardSuper.
-     */
-    @Test
-    public void testSCALocalWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestWildcardSuper(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getWildcardExtends.
-     */
-    @Test
-    public void testSCALocalWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestWildcardExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getPolymorphic.
-     */
-    @Test
-    public void testSCALocalPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestPolymorphic(serviceClient);
-    }
-
-    private void performTestTypeExplicit(GenericsServiceClient serviceClient) {
-        Bean1<String> args[] = new Bean1[2];
-        args[0] = new Bean1<String>("Me");
-        args[1] = new Bean1<String>();
-        for(int i = 0; i < args.length; ++i) {
-            Bean1<String> arg = args[i];
-            Bean1<String> expected = GenericsTransformer.getTypeExplicit(arg);
-            Bean1<String> actual = serviceClient.getTypeExplicitForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestTypeUnbound(GenericsServiceClient serviceClient) {
-        {   // String
-            String[] args = { "Me", "You", "Him" };
-            Bean1<String> expected = GenericsTransformer.getTypeUnbound(args);
-            Bean1<String> actual = serviceClient.getTypeUnboundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   // Integer
-            Integer[] args = new Integer[3];
-            args[0] = -10;
-            args[1] = 0;
-            args[2] = 10;
-            Bean1<Integer> expected = GenericsTransformer.getTypeUnbound(args);
-            Bean1<Integer> actual = serviceClient.getTypeUnboundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   // Object
-            Object[] args = new Object[3];
-            args[0] = "Me";
-            args[1] = 10;
-            args[2] = "Him";
-            Bean1<Object> expected = GenericsTransformer.getTypeUnbound(args);
-            Bean1<Object> actual = serviceClient.getTypeUnboundForward(args);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    private void performTestTypeExtends(GenericsServiceClient serviceClient) {
-        {   // Bean2
-            Bean2[] args = new Bean2[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean2();
-                args[i].setName("Name"+i);
-            }
-            
-            Bean1<Bean2> expected = GenericsTransformer.getTypeExtends(args);
-            Bean1<Bean2> actual = serviceClient.getTypeExtendsForward(args);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean3 extends Bean2
-            Bean3[] args = new Bean3[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean3();
-                args[i].setName("Name"+i);
-                args[i].setAddress("Address"+i);
-            }
-            
-            Bean1<Bean3> expected = GenericsTransformer.getTypeExtends(args);
-            Bean1<Bean3> actual = serviceClient.getTypeExtendsForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   //Bean31 extends Bean2
-            Bean31[] args = new Bean31[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean31();
-                args[i].setName("Name"+i);
-                args[i].setAddress("Address"+i);
-            }
-            
-            Bean1<Bean31> expected = GenericsTransformer.getTypeExtends(args);
-            Bean1<Bean31> actual = serviceClient.getTypeExtendsForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestRecursiveTypeBound(GenericsServiceClient serviceClient) {
-        {   // Bean1<String>
-            Bean1<String>[] args = new Bean1[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean1<String>();
-                args[i].setItem("Bean."+i);
-            }
-            Bean1<Bean1<String>> expected = GenericsTransformer.getRecursiveTypeBound(args);
-            Bean1<Bean1<String>> actual = serviceClient.getRecursiveTypeBoundForward(args);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean10 extends Bean1<String>
-            Bean10[] args = new Bean10[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean10();
-                args[i].setItem("Bean10."+i);
-            }
-            Bean1<Bean10> expected = GenericsTransformer.getRecursiveTypeBound(args);
-            Bean1<Bean10> actual = serviceClient.getRecursiveTypeBoundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   // Bean11 extends Bean1<String>
-            Bean11[] args = new Bean11[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean11();
-                args[i].setItem("Bean11."+i);
-            }
-            Bean1<Bean11> expected = GenericsTransformer.getRecursiveTypeBound(args);
-            Bean1<Bean11> actual = serviceClient.getRecursiveTypeBoundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    private void performTestWildcardUnbound(GenericsServiceClient serviceClient) {
-        {
-            Bean1<?> arg = new Bean1<String>("Me");
-            Bean1<?> expected = GenericsTransformer.getWildcardUnbound(arg);
-            Bean1<?> actual = serviceClient.getWildcardUnboundForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-        {
-            Bean1<?> arg = new Bean1<Integer>(1);
-            Bean1<?> expected = GenericsTransformer.getWildcardUnbound(arg);
-            Bean1<?> actual = serviceClient.getWildcardUnboundForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    private void performTestWildcardSuper(GenericsServiceClient serviceClient) {
-        Bean1<? super Bean3> arg = new Bean1<Bean2>();
-        Bean3 item = new Bean3();
-        item.setName("Name");
-        item.setAddress("Address");
-        arg.setItem(item);
-        Bean1<? super Bean3> expected = GenericsTransformer.getWildcardSuper(arg);
-        Bean1<? super Bean3> actual = serviceClient.getWildcardSuperForward(arg);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestWildcardExtends(GenericsServiceClient serviceClient) {
-        {   // Bean2
-            Bean2 temp = new Bean2();
-            temp.setName("Me");
-            Bean1<? extends Bean2> arg = new Bean1<Bean2>(temp);
-            Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg);
-            Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean3 extends Bean2
-            Bean3 temp = new Bean3();
-            temp.setName("Me");
-            temp.setAddress("My address");
-            Bean1<? extends Bean2> arg = new Bean1<Bean3>(temp);
-            Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg);
-            Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg);
-            // The Bean3 will be unmarshalled into Bean2
-            // Assert.assertEquals(expected, actual);
-            Assert.assertTrue(actual.getItem() instanceof Bean2);
-        }
-        {   // Bean31 extends Bean2
-            Bean31 temp = new Bean31();
-            temp.setName("Me1");
-            temp.setAddress("My address1");
-            Bean1<? extends Bean2> arg = new Bean1<Bean31>(temp);
-            Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg);
-            Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg);
-            // The Bean31 will be unmarshalled into Bean2
-            // Assert.assertEquals(expected, actual);
-            Assert.assertTrue(actual.getItem() instanceof Bean2);
-        }
-    }
-    
-    private void performTestPolymorphic(GenericsServiceClient serviceClient) {
-        {   // Bean2
-            Bean2 arg = new Bean2();
-            arg.setName("Me");
-            Bean2 expected = GenericsTransformer.getPolymorphic(arg);
-            Bean2 actual = serviceClient.getPolymorphicForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean3 extends Bean2
-            Bean3 arg = new Bean3();
-            arg.setName("Me");
-            arg.setAddress("My address");
-            Bean2 expected = GenericsTransformer.getPolymorphic(arg);
-            Bean2 actual = serviceClient.getPolymorphicForward(arg);
-            Assert.assertEquals(expected.getName(), actual.getName());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
deleted file mode 100644
index f8aaad3dac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ /dev/null
@@ -1,776 +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.itest.databindings.jaxb;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PrimitivesDatabindingTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try { 
-            domain = SCADomain.newInstance("primitivesservice.composite");
-        } catch(Throwable e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testSCANegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testSCANegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testSCAPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testSCANegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testSCANegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testSCAPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testSCANegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testSCANegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for short array.
-     */
-    @Test
-    public void testSCAPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testSCANegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testSCANegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for int array.
-     */
-    @Test
-    public void testSCAPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testSCANegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testSCANegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for long array.
-     */
-    @Test
-    public void testSCAPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testSCANegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testSCANegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for float array.
-     */
-    @Test
-    public void testSCAPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testSCANegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testSCANegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for double array.
-     */
-    @Test
-    public void testSCAPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testWSNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testWSNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testWSPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testWSNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testWSNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testWSPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testWSNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testWSNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for short array.
-     */
-    @Test
-    public void testWSPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testWSNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testWSNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for int array.
-     */
-    @Test
-    public void testWSPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testWSNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testWSNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for long array.
-     */
-    @Test
-    public void testWSPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testWSNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testWSNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for float array.
-     */
-    @Test
-    public void testWSPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testWSNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testWSNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for double array.
-     */
-    @Test
-    public void testWSPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testSCALocalNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testSCALocalNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testSCALocalNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testSCALocalNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testSCALocalNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testSCALocalNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testSCALocalNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testSCALocalNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testSCALocalNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testSCALocalNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testSCALocalNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testSCALocalNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testSCALocalNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testSCALocalNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-    
-    private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) {
-        Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false));
-        Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true));
-    }
-
-    private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) {
-        boolean flags[] = new boolean[2];
-        flags[0] = false;
-        flags[1] = true;
-        boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags);
-        Assert.assertEquals(flags.length, respFlags.length);
-        for(int i = 0; i < flags.length; ++i) {
-            Assert.assertEquals(!flags[i], respFlags[i]);
-        }
-    }
-
-    private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) {
-        byte[] ba = new byte[3];
-        ba[0] = -1;
-        ba[1] = 0;
-        ba[2] = 1;
-
-        for(int i = 0; i < ba.length; ++i) {
-            Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i]));
-        }
-    }
-
-    private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) {
-        byte[] ba = new byte[3];
-        ba[0] = -1;
-        ba[1] = 0;
-        ba[2] = 1;
-
-        byte[] r = primitivesServiceClient.negateByteArrayForward(ba);
-        Assert.assertEquals(ba.length, r.length);
-        for(int i = 0; i < ba.length; ++i) {
-            Assert.assertEquals((byte)-ba[i], r[i]);
-        }
-    }
-    
-    private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) {
-        short[] s = new short[3];
-        s[0] = -1;
-        s[1] = 0;
-        s[2] = 1;
-
-        for(int i = 0; i < s.length; ++i) {
-            Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i]));
-        }
-    }
-
-    private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) {
-        short[] s = new short[3];
-        s[0] = -1;
-        s[1] = 0;
-        s[2] = 1;
-
-        short[] r = primitivesServiceClient.negateShortArrayForward(s);
-        Assert.assertEquals(s.length, r.length);
-        for(int i = 0; i < s.length; ++i) {
-            Assert.assertEquals((short)-s[i], r[i]);
-        }
-    }
-
-    private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) {
-        int[] ia = new int[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i]));
-        }
-    }
-
-    private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) {
-        int[] ia = new int[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        int[] r = primitivesServiceClient.negateIntArrayForward(ia);
-        Assert.assertEquals(ia.length, r.length);
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], r[i]);
-        }
-    }
-
-    private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) {
-        long[] la = new long[3];
-        la[0] = -1;
-        la[1] = 0;
-        la[2] = 1;
-
-        for(int i = 0; i < la.length; ++i) {
-            Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i]));
-        }
-    }
-
-    private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) {
-        long[] la = new long[3];
-        la[0] = -1;
-        la[1] = 0;
-        la[2] = 1;
-
-        long[] r = primitivesServiceClient.negateLongArrayForward(la);
-        Assert.assertEquals(la.length, r.length);
-        for(int i = 0; i < la.length; ++i) {
-            Assert.assertEquals(-la[i], r[i]);
-        }
-    }
-
-    private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) {
-        float[] fa = new float[3];
-        fa[0] = -1;
-        fa[1] = 0;
-        fa[2] = 1;
-
-        for(int i = 0; i < fa.length; ++i) {
-            Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i]));
-        }
-    }
-
-    private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) {
-        float[] ia = new float[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        float[] r = primitivesServiceClient.negateFloatArrayForward(ia);
-        Assert.assertEquals(ia.length, r.length);
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], r[i]);
-        }
-    }
-
-    private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) {
-        double[] da = new double[3];
-        da[0] = -1;
-        da[1] = 0;
-        da[2] = 1;
-
-        for(int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i]));
-        }
-    }
-
-    private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) {
-        double[] da = new double[3];
-        da[0] = -1;
-        da[1] = 0;
-        da[2] = 1;
-
-        double[] r = primitivesServiceClient.negateDoubleArrayForward(da);
-        Assert.assertEquals(da.length, r.length);
-        for(int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(-da[i], r[i]);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
deleted file mode 100644
index ebfa1c5bdd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ /dev/null
@@ -1,1439 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.Assert;
-
-import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.tuscany.sca.databinding.xml.String2Node;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StandardTypesDatabindingTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("standard-types-service.composite");
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testSCANewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testSCANewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testSCANewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testSCANewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testSCANewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testSCANewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testSCANewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testSCANewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testSCANewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testSCANewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testSCANewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testSCANewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testSCANewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testSCANewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testSCANewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testSCANewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testSCANewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testSCANewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testSCANewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testSCANewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    public void testSCANewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    public void testSCANewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    public void testSCANewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2387")
-    public void testSCANewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testSCANewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testSCANewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testWSNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testWSNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testWSNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testWSNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testWSNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testWSNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testWSNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testWSNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testWSNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testWSNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testWSNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testWSNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testWSNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testWSNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testWSNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testWSNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testWSNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2389")
-    public void testWSNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testWSNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testWSNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    public void testWSNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    public void testWSNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
-    public void testWSNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2386")
-    public void testWSNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testWSNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testWSNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testSCALocalNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testSCALocalNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testSCALocalNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testSCALocalNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testSCALocalNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testSCALocalNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testSCALocalNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testSCALocalNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testSCALocalNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testSCALocalNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testSCALocalNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testSCALocalNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testSCALocalNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testSCALocalNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testSCALocalNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testSCALocalNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testSCALocalNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testSCALocalNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testSCALocalNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testSCALocalNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalLocalService service using SCA binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    public void testSCALocalNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    public void testSCALocalNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    public void testSCALocalNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    public void testSCALocalNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testSCALocalNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testSCALocalNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) {
-        BigInteger bi = new BigInteger("1234567890123456789012345678901234");
-        BigInteger expected = bi.negate();
-        BigInteger actual = serviceClient.getNewBigIntegerForward(bi);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) {
-        BigInteger[] bia = new BigInteger[2];
-        bia[0] = new BigInteger("1234567890123456789012345678901234");
-        bia[1] = new BigInteger("-98765432109876543210987654321");
-        BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia);
-        Assert.assertEquals(bia.length, actual.length);
-        for (int i = 0; i < bia.length; ++i) {
-            Assert.assertEquals(bia[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) {
-        BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234");
-        BigDecimal expected = bd.negate();
-        BigDecimal actual = serviceClient.getNewBigDecimalForward(bd);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) {
-        BigDecimal[] bda = new BigDecimal[2];
-        bda[0] = new BigDecimal("1234567890123456.789012345678901234");
-        bda[1] = new BigDecimal("-987654321098765.43210987654321");
-        BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda);
-        Assert.assertEquals(bda.length, actual.length);
-        for (int i = 0; i < bda.length; ++i) {
-            Assert.assertEquals(bda[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewCalendar(StandardTypesServiceClient serviceClient) {
-        Calendar[] ca = new Calendar[3];
-        String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"};
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i]));
-            ca[i].set(Calendar.DAY_OF_MONTH, i + 1);
-        }
-        for (int i = 0; i < ca.length; ++i) {
-            Calendar actual = serviceClient.getNewCalendarForward(ca[i]);
-            ca[i].add(Calendar.DAY_OF_MONTH, 5);
-            if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) {
-                // FIXME: Is this a problem?
-                // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
-                // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
-                ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
-            }
-            Assert.assertEquals(ca[i], actual);
-        }
-    }
-
-    private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) {
-        Calendar[] ca = new Calendar[3];
-        String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"};
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i]));
-            ca[i].set(Calendar.DAY_OF_MONTH, i + 1);
-        }
-        Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca);
-        Assert.assertEquals(ca.length, actual.length);
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i].add(Calendar.DAY_OF_MONTH, 5);
-            if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) {
-                // FIXME: Is this a problem?
-                // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
-                // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
-                ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
-            }
-            Assert.assertEquals(ca[i], actual[i]);
-        }
-    }
-
-    private void performTestNewDate(StandardTypesServiceClient serviceClient) {
-        Date d = new Date();
-        Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000);
-        Date actual = serviceClient.getNewDateForward(d);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewDateArray(StandardTypesServiceClient serviceClient) {
-        Date[] d = new Date[2];
-        Date[] expected = new Date[d.length];
-        for (int i = 0; i < d.length; ++i) {
-            d[i] = new Date();
-            d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000);
-            expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000);
-        }
-        Date[] actual = serviceClient.getNewDateArrayForward(d);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < expected.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewQName(StandardTypesServiceClient serviceClient) {
-        QName[] qnames = new QName[3];
-        qnames[0] = new QName("localPart");
-        qnames[1] = new QName("namespaceUri", "localPart");
-        qnames[2] = new QName("namespaceUri", "localPart", "prefix");
-        QName[] expected = new QName[qnames.length];
-        for (int i = 0; i < qnames.length; ++i) {
-            expected[i] =
-                new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q",
-                          qnames[i].getPrefix() + "q");
-        }
-        for (int i = 0; i < qnames.length; ++i) {
-            QName actual = serviceClient.getNewQNameForward(qnames[i]);
-            Assert.assertEquals(expected[i], actual);
-        }
-    }
-
-    private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) {
-        QName[] qnames = new QName[4];
-        qnames[0] = new QName("localPart");
-        qnames[1] = new QName("namespaceUri", "localPart");
-        qnames[2] = new QName("namespaceUri", "localPart", "prefix");
-        qnames[3] = new QName("localPart2");
-        QName[] expected = new QName[qnames.length];
-        for (int i = 0; i < qnames.length; ++i) {
-            expected[i] =
-                new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q",
-                          qnames[i].getPrefix() + "q");
-        }
-        QName[] actual = serviceClient.getNewQNameArrayForward(qnames);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < qnames.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewURI(StandardTypesServiceClient serviceClient) {
-        URI[] uris = new URI[4];
-        uris[0] = URI.create("a/b/c");
-        uris[1] = URI.create("http://abc/");
-        uris[2] = URI.create("ftp://a/b");
-        uris[3] = URI.create("http://abc/").resolve("xyz");
-
-        for (int i = 0; i < uris.length; ++i) {
-            URI expected = uris[i].resolve("uri");
-            URI actual = serviceClient.getNewURIForward(uris[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewURIArray(StandardTypesServiceClient serviceClient) {
-        URI[] uris = new URI[4];
-        uris[0] = URI.create("a/b/c");
-        // [rfeng] We need to have a trialign / to avoid the resolving problem
-        // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is
-        // not making to the caller intact.
-        uris[1] = URI.create("http://abc/");
-        uris[2] = URI.create("ftp://a/b");
-        uris[3] = URI.create("http://abc/").resolve("xyz");
-
-        URI[] expected = new URI[uris.length];
-        for (int i = 0; i < uris.length; ++i) {
-            expected[i] = uris[i].resolve("uri");
-        }
-
-        URI[] actual = serviceClient.getNewURIArrayForward(uris);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < uris.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3];
-        xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19));
-        xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13));
-        xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16));
-
-        for (int i = 0; i < xgcals.length; ++i) {
-            XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]);
-            xgcals[i].setDay(xgcals[i].getDay() + 5);
-            Assert.assertEquals(xgcals[i], actual);
-        }
-    }
-
-    private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3];
-        xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19));
-        xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13));
-        xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16));
-
-        XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals);
-        Assert.assertEquals(xgcals.length, actual.length);
-        for (int i = 0; i < xgcals.length; ++i) {
-            xgcals[i].setDay(xgcals[i].getDay() + 5);
-            Assert.assertEquals(xgcals[i], actual[i]);
-        }
-    }
-
-    private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        Duration[] da = new Duration[3];
-        da[0] = df.newDuration(1000000000000L);
-        da[1] = df.newDurationDayTime(1000000000000L);
-        da[2] = df.newDurationYearMonth(true, 1, 3);
-
-        for (int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i]));
-        }
-    }
-
-    private void performTestNewObject(StandardTypesServiceClient serviceClient) {
-        Object[] objs = new Object[5];
-        objs[0] = "Hello";
-        objs[1] = 10;
-        objs[2] = null;
-        objs[3] = -1.0;
-        objs[4] = null;
-
-        for (int i = 0; i < objs.length; ++i) {
-            Object expected = StandardTypesTransformer.getNewObject(objs[i]);
-            Object actual = serviceClient.getNewObjectForward(objs[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) {
-        Object[] objs = new Object[5];
-        objs[0] = "Hello";
-        objs[1] = 10;
-        objs[2] = null;
-        objs[3] = -1.0;
-        objs[4] = null;
-
-        Object[] actual = serviceClient.getNewObjectArrayForward(objs);
-        Assert.assertEquals(objs.length, actual.length);
-        for (int i = 0; i < objs.length; ++i) {
-            Object expected = StandardTypesTransformer.getNewObject(objs[i]);
-            Assert.assertEquals(expected, actual[i]);
-        }
-    }
-
-    private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException {
-        // Create some images to test with.
-        Image[] imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        Image[] copy = imgs;
-        // Create the same images once again as the StandardTypesTransformer may manipulate the image passed.
-        imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        // Make sure the images and copies are equal using ImageInfo
-        for(int i = 0; i < imgs.length; ++i) {
-            Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i]));
-        }
-
-        for (int i = 0; i < imgs.length; ++i) {
-            Image actual = serviceClient.getNewImageForward(imgs[i]);
-            Image expected = StandardTypesTransformer.getNewImage(copy[i]);
-            // Compare using ImageInfo
-            Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual));
-        }
-    }
-
-    private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException {
-        // Create some images to test with.
-        Image[] imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        Image[] copy = imgs;
-        // Create the same images once again as the StandardTypesTransformer may manipulate the image passed.
-        imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        // Make sure the images and copies are equal using ImageInfo
-        for(int i = 0; i < imgs.length; ++i) {
-            Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i]));
-        }
-
-        Image[] actual = serviceClient.getNewImageArrayForward(imgs);
-        Assert.assertEquals(imgs.length, actual.length);
-        for (int i = 0; i < imgs.length; ++i) {
-            Image expected = StandardTypesTransformer.getNewImage(copy[i]);
-            // Compare using ImageInfo
-            Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i]));
-        }
-    }
-
-    private void performTestNewDurationArray(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        Duration[] da = new Duration[3];
-        da[0] = df.newDuration(1000000000000L);
-        da[1] = df.newDurationDayTime(1000000000000L);
-        da[2] = df.newDurationYearMonth(true, 1, 3);
-
-        Duration[] actual = serviceClient.getNewDurationArrayForward(da);
-        Assert.assertEquals(da.length, actual.length);
-        for (int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(da[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException {
-        DataHandler[] dha = new DataHandler[3];
-        dha[0] = new DataHandler("Some data", "text/plain");
-        dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite"));
-        dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
-
-        for (int i = 0; i < dha.length; ++i) {
-            DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]);
-            // Note: The DataHandler returned may use a different type of DataSource.
-            // Compare the data content instead of using equals().
-            Assert.assertTrue(compare(dha[i], actual));
-        }
-    }
-
-    private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException {
-        DataHandler[] dha = new DataHandler[3];
-        dha[0] = new DataHandler("Some data", "text/plain");
-        dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite"));
-        dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
-
-        DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha);
-        Assert.assertEquals(dha.length, actual.length);
-        for (int i = 0; i < dha.length; ++i) {
-            // Note: The DataHandler returned may use a different type of DataSource.
-            // Compare the data content instead of using equals().
-            Assert.assertTrue(compare(dha[i], actual[i]));
-        }
-    }
-
-    private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception {
-        String xml = new String("<a>A<b>B</b><c>C</c></a>");
-        Source[] srcs = new Source[3];
-        srcs[0] = new DOMSource(new String2Node().transform(xml, null));
-        srcs[1] = new SAXSource(new InputSource(new StringReader(xml)));
-        srcs[2] = new StreamSource(new StringReader(xml));
-
-        for (int i = 0; i < srcs.length; ++i) {
-            Source expected = StandardTypesTransformer.getNewSource(srcs[i]);
-            Source actual = serviceClient.getNewSourceForward(srcs[i]);
-            // [rfeng] The data may come back as a different source
-            Assert.assertEquals(sourceToString(expected), sourceToString(actual));
-        }
-    }
-
-    private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception {
-        String xml = new String("<a>A<b>B</b><c>C</c></a>");
-        Source[] srcs = new Source[3];
-        srcs[0] = new DOMSource(new String2Node().transform(xml, null));
-        srcs[1] = new SAXSource(new InputSource(new StringReader(xml)));
-        srcs[2] = new StreamSource(new StringReader(xml));
-
-        Source[] actual = serviceClient.getNewSourceArrayForward(srcs);
-        Source[] expected = new Source[srcs.length];
-        for(int i = 0; i < srcs.length; ++i) {
-            expected[i] = StandardTypesTransformer.getNewSource(srcs[i]);
-        }
-        Assert.assertEquals(srcs.length, actual.length);
-        for (int i = 0; i < srcs.length; ++i) {
-            // [rfeng] The data may come back as a different source
-            Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i]));
-        }
-
-    }
-
-    private void performTestNewUUID(StandardTypesServiceClient serviceClient) {
-        UUID[] uuids = new UUID[3];
-        uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes());
-        uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes());
-        uuids[2] = UUID.randomUUID();
-
-        for (int i = 0; i < uuids.length; ++i) {
-            UUID expected = UUID.fromString(uuids[i].toString() + "AAA");
-            UUID actual = serviceClient.getNewUUIDForward(uuids[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) {
-        UUID[] uuids = new UUID[3];
-        uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes());
-        uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes());
-        uuids[2] = UUID.randomUUID();
-
-        UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids);
-        for (int i = 0; i < uuids.length; ++i) {
-            UUID expected = UUID.fromString(uuids[i].toString() + "AAA");
-            Assert.assertEquals(expected, actual[i]);
-        }
-    }
-    
-    /**
-     * This method compares two DataHandlers.
-     * @return true if the data in the two handlers is the same.
-     */
-    private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException {
-        InputStream inp1 = dh1.getInputStream();
-        InputStream inp2 = dh2.getInputStream();
-        for(;;) {
-            int i1 = inp1.read();
-            int i2 = inp2.read();
-            if(i1 == -1 && i2 == -1) {
-                return true;
-            } else if(i1 != -1 && i2 != -1) {
-                if(i1 != i2) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
-    
-    /**
-     * This method returns the content of a source object as String.
-     */
-    private String sourceToString(Source s) throws Exception {
-        StringWriter sw = new StringWriter();
-        Result r  = new StreamResult(sw);
-        TransformerFactory.newInstance().newTransformer().transform(s, r);
-        sw.close();
-        return sw.toString();
-    }
-    
-    /**
-     * This class initializes with the width, height and pixel data of a java.awt.Image object.
-     */
-    private static class ImageInfo {
-        private int h, w, pixels[];
-        public ImageInfo(Image img) throws InterruptedException {
-            w = img.getWidth(null);
-            h = img.getHeight(null);
-            pixels = new int[w*h];
-            PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w);
-            pg.grabPixels();
-        }
-        
-        public boolean equals(Object that) {
-            if(that == null) {
-                return false;
-            } else if(!(that instanceof ImageInfo)) {
-                return false;
-            }
-            
-            ImageInfo that1 = (ImageInfo)that;
-            if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) {
-                return false;
-            }
-            for(int i = 0; i < pixels.length; ++i) {
-                if(pixels[i] != that1.pixels[i]) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        
-        public String toString() {
-            return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]";
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/pom.xml b/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/pom.xml
deleted file mode 100644
index ce9cb98537..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/pom.xml
+++ /dev/null
@@ -1,262 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb</artifactId>
-    <version>1.3</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA JAXB Databinding Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
- 
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <!-- Added by Simon Nash    -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>itest-databindings-common</artifactId>
-                                    <version>${project.version}</version>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>
-                        <argument>${project.build.directory}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <packageName>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</packageName>
-                    <wsdlDirectory>${project.build.directory}/classes/wsdl</wsdlDirectory>
-                    <wsdlFiles>
-                        <wsdlFile>Greeter.wsdl</wsdlFile>
-                    </wsdlFiles>
-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8381a164ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,172 +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.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-             
-               
-  <Template>
-    <TemplateName>GreeterService.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceClient.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>DatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>Greeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>
-    <Factory>ObjectFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>  
-    <Factory>ObjectFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>   
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>     
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>         
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile>  
-</tns:Generate>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/src/main/resources/greeter.composite
deleted file mode 100644
index ae0740e6fe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ /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.

--->

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

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="JAXBGreeterService">

-           

-    <!-- Clients to test the services -->

-    <component name="DefaultGreeterServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />

-        <reference name="greeterService" target="JAXBGreeterServiceComponent"/>

-    </component>

-

-    <component name="WSGreeterServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />

-    </component>

-

-    <reference name="JAXBGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">

-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>

-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>

-    </reference>           

-

-    <!-- The greeter service -->

-    <service name="JAXBGreeterService" promote="JAXBGreeterServiceComponent">

-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>

-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>

-    </service>

-

-    <!-- Components used to implement the services -->

-    <component name="JAXBGreeterServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceImpl" />

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/pom.xml b/tags/java/sca/1.3-RC1a/itest/databindings/pom.xml
deleted file mode 100644
index 6926ad2deb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/pom.xml
+++ /dev/null
@@ -1,46 +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>
-  <parent>
-      <groupId>org.apache.tuscany.sca</groupId>
-      <artifactId>tuscany-itest</artifactId>
-      <version>1.3</version>
-      <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  
-  <groupId>org.apache.tuscany.sca</groupId>
-  <artifactId>itest-databindings</artifactId>
-  <name>Apache Tuscany SCA Databindings Integration Tests</name>
-  <version>1.3</version>
-  
-  
-  <packaging>pom</packaging>
-  <build>
-	<defaultGoal>install</defaultGoal>
-  </build>
-  <modules>
-    <module>common</module>
-    <module>sdogen</module>
-    <module>jaxbgen</module>
-    <module>jaxb-bottom-up</module>
-    <module>interop</module>
-  </modules>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/readme.html b/tags/java/sca/1.3-RC1a/itest/databindings/readme.html
deleted file mode 100644
index 24a44e4ed7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/readme.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
- * 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.    
--->
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content=
-  "text/html; charset=us-ascii">
-  <meta http-equiv="Content-Style-Type" content="text/css">
-
-  <title>Tuscany SCA Integration Test Databindings</title>
-  <!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
-  <link rel="stylesheet" href="../../css/base.css" type="text/css">
-</head>
-
-<body>
-<h3>Tuscany SCA Integation Test Databindings </h3>
-
-<h4>Overview</h4>
-
-<p>
-This integration test tests the Tuscany SCA databinding implementation by passing various data structures 
-across various bindings using the supported databindings. There are tests for the individual databindings 
-which exercise various bindings with the same databinding at client and server ends of each binding. There 
-is also an integration test which exercises the transformer chains by specifying different databindings at 
-client and server ends of the binding. 
-</p>
-<p>
-In doing this testing it is apparent that there is a lot of repetition in creating client, services, idl and 
-type for each of the data types for each of the bindings for each of the databindings. To reduce the amount 
-of effort required to maintain the tests as new types, bindings and databindings are added the test cases 
-themselves are generated from configuration files. 
-</p>
-
-<h4>Test Structure</h4>
-
-Databindings/Common             - hold files common across all tests <br/>
-Databindings/Interop            - test the transformer chains with combinations of databindings<br/>
-Databindings/sdogen and jaxbgen - test each databindings independently<br/>
-
-<h4>Test Generation</h4>
-<p>
-To reduce the amount of manual effort involved in building and maintaining tests cases the test cases 
-themselves are generated at run time using a set of velocity templates. Each test module has a generate.xml 
-file in the resources/generate directory which tells the generator what to do. The file looks like this. 
-</p>
-<img src="config.png">
-<p>
-Each <Template> element describes a velocit template to use in the test. The generator process is to expand
-each velocity template provided with all of the types specified in the <InputFile> sections. 
-</p>
-<p>
-Each <InputFile> element describes a schema file used in the test. It also contains a description of each 
-data type that will be tested. The generator then arranges for the databinding being tested to generate 
-appropriate Java classes to represent the type at runtime. The individual databinding tests use the following 
-flow.
-</p>
-
-Create data object at client<br/>
-Client passes data object to server<br/>
-Server modifies data object<br/>
-Server returns modified data object to client<br/>
-Client tests that modified data object is as expected<br/>
-<p>
-Hence the CreateTypeCode, ModifyTypeCode and ResultComparison elements which contain the type specific code 
-that is used in the tests. 
-</p>
-
-<h4>The Common Directory</h4>
-<p>
-The common directory contains the information that is common across all of the tests. This includes the 
-common velocity templates and the source for the generator that reads the config.xml for each test. Common 
-also contains all of the data type schema as these are common across all tests. Each test pom is written so 
-that the contents of the common project are expanded into the tests target directory before the test starts. 
-In this way all of the common elements are available for the test generation phase and at test runtime. 
-</p>
-
-<h4>Individual Databinding Tests</h4>
-<p>
-The individual databinding tests, for example, sdogen and jaxbgen, are mostly empty as their content is 
-generated at runtime. The configuration and any test specific templates can be found in the resources/generate 
-directory. Some files are hand crafted for each test and live in their static position in the tests directory 
-structure. 
-</p>
-<p>
-Each test uses the same scenario
-</p>
-<img src="databinding.png">
-<p>
-The interface exposed by the greeter service provides a greet method for each data type being tested, for 
-example, 
-</p>
-<code>
-PersonType greetPersonType(PersonType param);<br/>
-AttributeComplexType greetAttributeComplexType(AttributeComplexType param);<br/>
-AttributeReferenceComplexType greetAttributeReferenceComplexType(AttributeReferenceComplexType param);<br/>
-</code>
-<p>
-These methods are taken from the SDO databinding test and hence PersonType, AttributeComplexType, etc. will 
-have been generated by the SDO static type generator. 
-</p>
-<p>
-Hence this tests a single databinding across a variety of data types and a variety of bindings. New bindings 
-be tested by extending the composite. Be datatypes can be tested by updating the confix.xml file.
-</p>
-<h4>Databinding Interoperability Tests</h4>
-<p>
-This test uses the generated client, services and types from the individual databinding tests. It does not
-regenerate them and you will see a dependency in the interop test pom on the other databinding tests. Is also 
-has some generate elements because the composite file must currently have import statements for all of the 
-SDO factories required during tested.
-</p>
-<p>
-The scenario used here is,
-</p>
-<img src="interop.png">
-<p>
-A chain of components is built up for each binding. Each component, drawn from the the inidividual databinding
-tests, tests the full range of datatypes. The client components are designed so that they can be chained together
-and so tranformations across different databindings is tests. The service component simply changes the data
-content and returns it as before. 
-</p>
-<h4>Building And Running The Tests</h4>
-<p>
-The tests can be built by doing the following. 
-</p>
-<code>
-cd sca/itest/databindings <br/>
-mvn
-</code>
-<p>
-The only modification to this process is required if a new input file is added to the tests suite. In this 
-case you will need to edit the config.xml files as appropriate but run mvn twice. This may sound a little 
-odd but currently the sdo test uses its pom file to generate the require SDO types. As the test is self 
-generating the pom file will not be updated to include the new type file until the second time it's run. The 
-aim is at some point to remove this feature from the pom. 
-</p>
-
-
-</body>
-</html>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/pom.xml b/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/pom.xml
deleted file mode 100644
index c8200058c4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/pom.xml
+++ /dev/null
@@ -1,251 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-sdo</artifactId>
-    <version>1.3</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA SDO Databinding Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency> 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency> 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>                 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency> 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>test</scope>
-        </dependency>
-	  <!-- Added by Mike Edwards    -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <scope>provided</scope>
-    </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-           <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>unpack</goal>
-                      </goals>
-                      <configuration>
-                          <artifactItems>
-                              <artifactItem>
-                                  <groupId>org.apache.tuscany.sca</groupId>
-                                  <artifactId>itest-databindings-common</artifactId>
-                                  <version>${project.version}</version>
-                                  <overWrite>true</overWrite>
-                                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                              </artifactItem>
-                          </artifactItems>
-                      </configuration>
-                  </execution>
-              </executions>              
-            </plugin>  
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sdo-source</id>
-                        <phase>process-resources</phase>                    
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>  
-                        <argument>${project.build.directory}</argument>
-                        <argument>true</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>                    
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>  
-                        <argument>${project.build.directory}</argument>
-                        <argument>true</argument>
-                    </arguments>
-                </configuration>
-            </plugin> 
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${project.build.directory}/classes/wsdl/Greeter.wsdl</fileName>
-                                    <javaPackage>org.apache.tuscany.sca.itest.databinding.services</javaPackage>
-                                </configuration>                            
-                            </schemaFiles>
-                            <noNotification>true</noNotification>
-                            <noContainment>true</noContainment>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 3f9926604d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,170 +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.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-             
-  <Template>
-    <TemplateName>greeter.composite.vm</TemplateName>
-    <TemplateTargetDir>classes</TemplateTargetDir>
-  </Template>                
-  <Template>
-    <TemplateName>GreeterService.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template>                                 
-  <Template>
-    <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>DatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>Greeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage>
-    <Factory>TypesFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        TypesFactory factory = TypesFactory.INSTANCE;
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.interop</JavaPackage>  
-    <Factory>InteropFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>      
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>            
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile>  
-</tns:Generate>
diff --git a/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
deleted file mode 100644
index 9494d70f96..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-    name="SDOGreeterService">
-    
-    <!-- SDO factory classes -->    
-    <dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.services.ServicesFactory"/>    
-    #foreach( $file in $fileList )
-  <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
-    #end    
-    
-    <!-- Clients to test the services -->
-    <component name="DefaultGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-        <reference name="greeterService" target="SDOGreeterServiceComponent"/>
-    </component>
-
-    <component name="WSGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-    </component>
-
-    <reference name="SDOGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
-    </reference>    
-    
-    <!-- The greeter service -->
-    <service name="SDOGreeterService" promote="SDOGreeterServiceComponent">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
-    </service>
-
-    <component name="SDOGreeterServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/pom.xml
deleted file mode 100644
index 778cfd7dec..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/pom.xml
+++ /dev/null
@@ -1,243 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>itest-exceptions-cross-binding-ws</artifactId>
-    <name>Apache Tuscany SCA WS Binding Exceptions Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-    
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>test</scope>
-        </dependency>        
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                      <id>copy</id>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>copy</goal>
-                      </goals>
-                      <configuration>
-                         <artifactItems>
-                             <artifactItem>
-                                 <groupId>javax.xml.ws</groupId>
-                                 <artifactId>jaxws-api</artifactId>
-                                 <version>2.1</version>
-                                 <type>jar</type>
-                             </artifactItem>
-                             <artifactItem>
-                                 <groupId>javax.xml.bind</groupId>
-                                 <artifactId>jaxb-api</artifactId>
-                                 <version>2.1</version>
-                                 <type>jar</type>
-                             </artifactItem>
-                         </artifactItems>
-                         <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                         <overWriteReleases>false</overWriteReleases>
-                         <overWriteSnapshots>true</overWriteSnapshots>
-                      </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <!-- Sun's JAX-WS Generation -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>generate-jaxb</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                    <packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
-                    <keep>true</keep>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <!-- SDO Generation -->
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/StockExceptionTest.wsdl</schemaFile>
-                            
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>1.3</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl/StockExceptionTest.wsdl</wsdlFile>
-                            <javaPackage>com.example.stock.sdo</javaPackage>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 4f4fe50041..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ /dev/null
@@ -1,71 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
-import org.osoa.sca.annotations.Service;
-
-/**
- * JAXB version of StockExceptionTest impl
- */
-@Service(StockExceptionTest.class)
-public class StockExchangeJaxB implements StockExceptionTest {
-
-    public StockExchangeJaxB() {
-
-    }
-
-    public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault,
-        TestNotDeclaredAtSourceFault {
-
-        System.out.println("stockQuoteOffer '" + input + "'");
-
-        String symbol = input.getSymbol();
-        if ("IBM".equals(symbol)) {
-            input.setPrice(99.00F);
-            return input;
-
-        } else if ("CLOSED".equals(input.getName())) {
-            throw new MarketClosedFault("TO LATE!", 3);
-
-        } else if ("UNDECLARED_SOURCE".equals(input.getName())) {
-
-            throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-
-        } else if ("UNDECLARED_TARGET".equals(input.getName())) {
-            throw new IllegalArgumentException("System fault");
-        }
-        ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
-        InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-
-        faultinfo.setOffer(input);
-
-        throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 95496e1737..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.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 org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public interface StockTraderSDO {
-
-    StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
-    void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
-    Object testNotDeclaredAtSourceTest();
-
-    Object testNotDeclaredAtTargetTest();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index 842dd4e602..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,136 +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.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- * 
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
-    private StockExceptionTest exchangeJaxb;
-
-    /**
-     * 
-     */
-
-    public StockTraderSDOImpl() {
-        // TODO Auto-generated constructor stub
-    }
-
-    @Reference
-    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
-        this.exchangeJaxb = exchangeJaxb;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
-     */
-    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        stockOffer.setName("IBM");
-        stockOffer.setSymbol("IBM");
-        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
-        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        return stockOfferAccepted;
-
-    }
-
-    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
-        MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        // set up for a InvalidSymbolSDOException
-        stockOffer.setName("");
-        stockOffer.setSymbol("IBM0");
-
-        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
-        exchangeJaxb.stockQuoteOffer(stockOffer);
-
-    }
-
-    public void marketClosedSDOExceptionTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("CLOSED");
-        stockOffer.setSymbol("MBI");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-            stockOfferAccepted.getPrice(); // the price actually bought.
-        } catch (InvalidSymbolSDOException e) {
-
-            e.printStackTrace();
-        } catch (MarketClosedSDOException e) {
-
-            e.printStackTrace();
-        }
-    }
-
-    public Object testNotDeclaredAtSourceTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("UNDECLARED_SOURCE");
-        stockOffer.setSymbol("XYZ");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        } catch (Exception e) {
-            return e;
-
-        }
-
-    }
-    
-    public Object testNotDeclaredAtTargetTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("UNDECLARED_TARGET");
-        stockOffer.setSymbol("XYZ");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        } catch (Exception e) {
-            return e;
-
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index 74815dc6c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ /dev/null
@@ -1,84 +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.test.exceptions.sdohandgen;
-
-import javax.xml.ws.WebFault;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-
-/**
- * 
- */
-@WebFault(name="InvalidSymbolFault", targetNamespace="http://scatesttool.stockexceptiontestservice")
-public class InvalidSymbolSDOException extends Exception {
-    private static final long serialVersionUID = -3824848763300476741L;
-    
-    /**
-     * 
-     */
-    public InvalidSymbolSDOException() {
-       
-    }
-
-    /**
-     * @param message
-     * @param faultInfo
-     */
-    public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-
-    }
-
-    /**
-     * @param cause
-     */
-    public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) {
-        super(cause);
-        this.faultInfo = faultInfo;
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-
-    }
-
-    // *** Below was hand added ... tooling needs to do this ***/
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     */
-    private InvalidSymbolFault faultInfo;
-
-    /**
-     * @return returns fault bean:
-     *         org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
-     */
-    public InvalidSymbolFault getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index aba83723bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.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.sca.test.exceptions.sdohandgen;
-
-import javax.xml.ws.WebFault;
-
-/**
- * 
- */
-@WebFault(name="MarketClosedFault", targetNamespace="http://scatesttool.stockexceptiontestservice")
-public class MarketClosedSDOException extends Exception {
-    private static final long serialVersionUID = 7652466275656958031L;
-
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     */
-    private int faultInfo;
-
-    /**
-     * 
-     */
-    public MarketClosedSDOException() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public MarketClosedSDOException(String message, int faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @param cause
-     */
-    public MarketClosedSDOException(int faultInfo, Throwable cause) {
-        super(cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public MarketClosedSDOException(String message, int faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @return returns fault bean: int
-     */
-    public int getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index ab65efbb58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.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.    
- */
-/**
- * StockExceptionTest.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import org.osoa.sca.annotations.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-public interface StockExceptionTest {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index acecdff613..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
-    name="ExceptionTest">
-    <include name="foo:intracomposite" />
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
deleted file mode 100644
index 460edab182..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ /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.
--->
-<composite targetNamespace="http://foo" name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
-
-    <service name="exchangeJaxbService" promote="exchangeJaxbComponent">
-        <interface.java interface="org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest" />
-        <binding.ws
-            wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" />
-    </service>
-
-    <component name="exchangeJaxbComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" />
-    </component>
-
-    <component name="stockTraderSDOComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
-    </component>
-
-    <reference name="stockTraderSDOReference" promote="stockTraderSDOComponent/exchangeJaxb">
-        <interface.java interface="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest" />
-        <binding.ws
-            wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" />
-    </reference>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 40e87953b6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,148 +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://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"

-    xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

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

-    <wsdl:types>

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

-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-            <complexType name="StockOffer">

-                    <sequence>

-                        <element name="symbol" minOccurs="1" type="xsd:string" />

-                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->

-                        <element name="name" minOccurs="0" type="xsd:string" />

-                    </sequence>

-            </complexType>

-            

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="stockQuoteOfferResponse">

-                <complexType>

-                    <sequence>

-                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <!-- Faults -->

-            <element name="InvalidSymbolFault">

-                <complexType>

-                    <sequence>

-                        <element name="message"  minOccurs="1" type="xsd:string" />

-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <element name="MarketClosedFault"   type="xsd:int" />

-			

-			<element name="TestNotDeclaredAtSourceFault" type="xsd:string" />

-     

-        </schema>

-    </wsdl:types>

-

-

-    <wsdl:message name="stockQuoteOfferRequest">

-        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="stockQuoteOfferResponse">

-        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="InvalidSymbolFault">

-        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

-    </wsdl:message>

-

-    <wsdl:message name="MarketClosedFault">

-        <wsdl:part element="tns:MarketClosedFault" name="fault" />

-    </wsdl:message>

-

-   <wsdl:message name="TestNotDeclaredAtSourceFault">

-        <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="StockExceptionTest">

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

-

-            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

-            

-            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

-             

-            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />

-            

-            <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />

-        </wsdl:operation>

-

- 

-    </wsdl:portType>

-

-    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

-        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

-

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdlsoap:operation soapAction="" />

-

-            <wsdl:input name="stockQuoteOfferRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-

-            <wsdl:output name="stockQuoteOfferResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-            

-            <wsdl:fault name="InvalidSymbolException"> 

-            	<wsdlsoap:fault name="InvalidSymbolException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="MarketClosedException"> 

-            	<wsdlsoap:fault name="MarketClosedException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="TestNotDeclaredAtSourceException"> 

-            	<wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />

-            </wsdl:fault>

-

-

-

-        </wsdl:operation>

-

-

-    </wsdl:binding>

-

-    <wsdl:service name="StockExceptionTestService">

-        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/services/exchangeJaxbService" />

-

-        </wsdl:port>

-

-    </wsdl:service>

-

-</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ /dev/null
@@ -1,65 +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.    
- -->
-        <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:tns="http://scatesttool.stockexceptiontestservice"
-            >
-            <complexType name="StockOffer">
-                    <sequence>
-                        <element name="symbol" minOccurs="1" type="xsd:string" />
-                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
-                        <element name="name" minOccurs="0" type="xsd:string" />
-                    </sequence>
-            </complexType>
-            
-            <element name="stockQuoteOffer">
-                <complexType>
-                    <sequence>
-                        <element name="input" minOccurs="0" type="tns:StockOffer" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="stockQuoteOfferResponse">
-                <complexType>
-                    <sequence>
-                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <!-- Faults -->
-            <element name="InvalidSymbolFault">
-                <complexType>
-                    <sequence>
-                        <element name="message"  minOccurs="1" type="xsd:string" />
-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <element name="MarketClosedFault">
-                <complexType>
-                    <sequence>
-                        <element name="message"  minOccurs="1" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index fc49fa1d7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,102 +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.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.osoa.sca.ServiceRuntimeException;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
-    private SCADomain domain;
-    private StockTraderSDO stockTrader;
-
-    public void testTrading() {
-        try {
-            StockOffer sp = stockTrader.testTrading();
-            assertNotNull(sp);
-            assertEquals(99.00F, sp.getPrice());
-            assertEquals("IBM", sp.getSymbol());
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            fail(e + "");
-
-        }
-
-    }
-
-    public void testInvalidSymbolSDOException() {
-        try {
-            stockTrader.testInvalidSymbolSDOException();
-            fail("Expected InvalidSymbolSDOException");
-        } catch (InvalidSymbolSDOException e) {
-            InvalidSymbolFault isf = e.getFaultInfo();
-
-            assertNotNull(isf);
-            StockOffer sp = isf.getOffer();
-            assertEquals(11.00F, sp.getPrice());
-            assertEquals("IBM0", sp.getSymbol());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Expected InvalidSymbolSDOException" + e);
-
-        }
-    }
-
-    public void testNotDeclaredAtSourceException() {
-
-        Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-    
-    public void testNotDeclaredAtTargetException() {
-
-        Object ret = stockTrader.testNotDeclaredAtTargetTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("intracomposite.composite");
-        stockTrader = domain.getService(StockTraderSDO.class, "stockTraderSDOComponent");
-        assertNotNull(stockTrader);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/pom.xml b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/pom.xml
deleted file mode 100644
index c74eb997b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/pom.xml
+++ /dev/null
@@ -1,234 +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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>itest-exceptions-cross-binding</artifactId>
-    <name>Apache Tuscany SCA Cross-Binding Exceptions Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-    
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                      <id>copy</id>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>copy</goal>
-                      </goals>
-                      <configuration>
-                         <artifactItems>
-                             <artifactItem>
-                                 <groupId>javax.xml.ws</groupId>
-                                 <artifactId>jaxws-api</artifactId>
-                                 <version>2.1</version>
-                                 <type>jar</type>
-                             </artifactItem>
-                             <artifactItem>
-                                 <groupId>javax.xml.bind</groupId>
-                                 <artifactId>jaxb-api</artifactId>
-                                 <version>2.1</version>
-                                 <type>jar</type>
-                             </artifactItem>
-                         </artifactItems>
-                         <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                         <overWriteReleases>false</overWriteReleases>
-                         <overWriteSnapshots>true</overWriteSnapshots>
-                      </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <!-- JAX-WS Generation -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>generate-jaxb</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                    <packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
-                    <keep>true</keep>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <!-- SDO Generation -->
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</schemaFile>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>1.3</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</wsdlFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
deleted file mode 100644
index f5e36db7cd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ /dev/null
@@ -1,31 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface StockExceptionTestJAXB extends StockExceptionTest {
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 65751175fb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.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.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- */
-@Service(StockExceptionTestJAXB.class)
-public class StockExchangeJaxB implements StockExceptionTestJAXB {
-
-    /**
-     * 
-     */
-    public StockExchangeJaxB() {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
-     */
-    public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
-
-        System.out.println("stockQuoteOffer '" + input + "'");
-
-        String symbol = input.getSymbol();
-        if ("IBM".equals(symbol)) {
-            input.setPrice(99.00F);
-            return input;
-
-        }
-        else if ("CLOSED".equals(input.getName())) {
-            throw new MarketClosedFault("TO LATE!", 3);
-            
-        } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
-            
-            throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-            
-        }
-        ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
-        InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-        
-        faultinfo.setOffer(input);
-
-        throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 5f65d293ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public interface StockTraderSDO {
-
-    StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
-    void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
-
-    Object testNotDeclaredAtSourceTest();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index e84ae633e7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,119 +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.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- * 
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
-    private StockExceptionTest exchangeJaxb;
-
-    /**
-     * 
-     */
-
-    public StockTraderSDOImpl() {
-        // TODO Auto-generated constructor stub
-    }
-
-    @Reference
-    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
-        this.exchangeJaxb = exchangeJaxb;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
-     */
-    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        stockOffer.setName("IBM");
-        stockOffer.setSymbol("IBM");
-        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
-        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        return stockOfferAccepted;
-
-    }
-
-    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
-        MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        // set up for a InvalidSymbolSDOException
-        stockOffer.setName("");
-        stockOffer.setSymbol("IBM0");
-
-        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
-        exchangeJaxb.stockQuoteOffer(stockOffer);
-
-    }
-
-    public void marketClosedSDOExceptionTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("CLOSED");
-        stockOffer.setSymbol("MBI");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-            stockOfferAccepted.getPrice(); // the price actually bought.
-        } catch (InvalidSymbolSDOException e) {
-
-            e.printStackTrace();
-        } catch (MarketClosedSDOException e) {
-
-            e.printStackTrace();
-        }
-    }
-
-    public Object  testNotDeclaredAtSourceTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("testNotDeclaredAtSourceTest");
-        stockOffer.setSymbol("TNDAS");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return  exchangeJaxb.stockQuoteOffer(stockOffer);
-            
-        } catch (Exception e) {
-            return e;
-           
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index 74815dc6c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ /dev/null
@@ -1,84 +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.test.exceptions.sdohandgen;
-
-import javax.xml.ws.WebFault;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-
-/**
- * 
- */
-@WebFault(name="InvalidSymbolFault", targetNamespace="http://scatesttool.stockexceptiontestservice")
-public class InvalidSymbolSDOException extends Exception {
-    private static final long serialVersionUID = -3824848763300476741L;
-    
-    /**
-     * 
-     */
-    public InvalidSymbolSDOException() {
-       
-    }
-
-    /**
-     * @param message
-     * @param faultInfo
-     */
-    public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-
-    }
-
-    /**
-     * @param cause
-     */
-    public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) {
-        super(cause);
-        this.faultInfo = faultInfo;
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-
-    }
-
-    // *** Below was hand added ... tooling needs to do this ***/
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     */
-    private InvalidSymbolFault faultInfo;
-
-    /**
-     * @return returns fault bean:
-     *         org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
-     */
-    public InvalidSymbolFault getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index 5fe40935ec..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ /dev/null
@@ -1,75 +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.test.exceptions.sdohandgen;
-
-import javax.xml.ws.WebFault;
-
-/**
- * 
- */
-@WebFault(name="MarketClosedFault", targetNamespace="http://scatesttool.stockexceptiontestservice")
-public class MarketClosedSDOException extends Exception {
-    private static final long serialVersionUID = 7652466275656958031L;
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     */
-    private int faultInfo;
-
-    /**
-     * 
-     */
-    public MarketClosedSDOException() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public MarketClosedSDOException(String message, int faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @param cause
-     */
-    public MarketClosedSDOException(int faultInfo, Throwable cause) {
-        super(cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public MarketClosedSDOException(String message, int faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @return returns fault bean: int
-     */
-    public int getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index ab65efbb58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.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.    
- */
-/**
- * StockExceptionTest.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import org.osoa.sca.annotations.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-public interface StockExceptionTest {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index 872fd721d1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
-    name="ExceptionTest">
-
-    <include name="foo:intracomposite" />
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
deleted file mode 100644
index 83526cb6a1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/intracomposite.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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://foo" xmlns:foo="http://foo"
-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" name="intracomposite">
-
-    <component name="stockTraderSDOComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
-        <reference name="exchangeJaxb" target="exchangeJaxbComponent"></reference>
-    </component>
-
-    <component name="exchangeJaxbComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" />
-    </component>
-
-    <!-- Move to the end to verify the fix for TUSCANY-1165 -->
-    <!-- dbsdo:import.sdo factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory" / -->
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
deleted file mode 100644
index d70cdad313..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,141 +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://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"

-    xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

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

-    <wsdl:types>

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

-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-            <complexType name="StockOffer">

-                    <sequence>

-                        <element name="symbol" minOccurs="1" type="xsd:string" />

-                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->

-                        <element name="name" minOccurs="0" type="xsd:string" />

-                    </sequence>

-            </complexType>

-            

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="stockQuoteOfferResponse">

-                <complexType>

-                    <sequence>

-                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <!-- Faults -->

-            <element name="InvalidSymbolFault">

-                <complexType>

-                    <sequence>

-                        <element name="message"  minOccurs="1" type="xsd:string" />

-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <element name="MarketClosedFault">

-                <complexType>

-                    <sequence>

-                        <element name="message"  minOccurs="1" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-

-    <wsdl:message name="stockQuoteOfferRequest">

-        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="stockQuoteOfferResponse">

-        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="InvalidSymbolFault">

-        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

-    </wsdl:message>

-

-    <wsdl:message name="MarketClosedFault">

-        <wsdl:part element="tns:MarketClosedFault" name="fault" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="StockExceptionTest">

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

-

-            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

-<!--            

-            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

-             

-            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />           

--->

-        </wsdl:operation>

-

- 

-    </wsdl:portType>

-

-    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

-        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

-

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdlsoap:operation soapAction="" />

-

-            <wsdl:input name="stockQuoteOfferRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-

-            <wsdl:output name="stockQuoteOfferResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-<!--            

-            <wsdl:fault name="InvalidSymbolException"> 

-            	<wsdlsoap:fault name="InvalidSymbolException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="MarketClosedException"> 

-            	<wsdlsoap:fault name="MarketClosedException" use="literal" />

-            </wsdl:fault>

--->

-        </wsdl:operation>

-

-

-    </wsdl:binding>

-

-    <wsdl:service name="StockExceptionTestService">

-        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />

-

-        </wsdl:port>

-

-    </wsdl:service>

-

-</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 33b830c856..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,148 +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://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"

-    xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

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

-    <wsdl:types>

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

-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-            <complexType name="StockOffer">

-                    <sequence>

-                        <element name="symbol" minOccurs="1" type="xsd:string" />

-                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->

-                        <element name="name" minOccurs="0" type="xsd:string" />

-                    </sequence>

-            </complexType>

-            

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="stockQuoteOfferResponse">

-                <complexType>

-                    <sequence>

-                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <!-- Faults -->

-            <element name="InvalidSymbolFault">

-                <complexType>

-                    <sequence>

-                        <element name="message"  minOccurs="1" type="xsd:string" />

-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

-                    </sequence>

-                </complexType>

-            </element>

-            

-            <element name="MarketClosedFault"   type="xsd:int" />

-			

-			<element name="TestNotDeclaredAtSourceFault" type="xsd:string" />

-     

-        </schema>

-    </wsdl:types>

-

-

-    <wsdl:message name="stockQuoteOfferRequest">

-        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="stockQuoteOfferResponse">

-        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="InvalidSymbolFault">

-        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

-    </wsdl:message>

-

-    <wsdl:message name="MarketClosedFault">

-        <wsdl:part element="tns:MarketClosedFault" name="fault" />

-    </wsdl:message>

-

-   <wsdl:message name="TestNotDeclaredAtSourceFault">

-        <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="StockExceptionTest">

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

-

-            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

-            

-            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

-             

-            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />

-            

-            <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />

-        </wsdl:operation>

-

- 

-    </wsdl:portType>

-

-    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

-        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

-

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-

-        <wsdl:operation name="stockQuoteOffer">

-            <wsdlsoap:operation soapAction="" />

-

-            <wsdl:input name="stockQuoteOfferRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-

-            <wsdl:output name="stockQuoteOfferResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-            

-            <wsdl:fault name="InvalidSymbolException"> 

-            	<wsdlsoap:fault name="InvalidSymbolException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="MarketClosedException"> 

-            	<wsdlsoap:fault name="MarketClosedException" use="literal" />

-            </wsdl:fault>

-            

-            <wsdl:fault name="TestNotDeclaredAtSourceException"> 

-            	<wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />

-            </wsdl:fault>

-

-

-

-        </wsdl:operation>

-

-

-    </wsdl:binding>

-

-    <wsdl:service name="StockExceptionTestService">

-        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />

-

-        </wsdl:port>

-

-    </wsdl:service>

-

-</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ /dev/null
@@ -1,65 +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.    
- -->
-        <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:tns="http://scatesttool.stockexceptiontestservice"
-            >
-            <complexType name="StockOffer">
-                    <sequence>
-                        <element name="symbol" minOccurs="1" type="xsd:string" />
-                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
-                        <element name="name" minOccurs="0" type="xsd:string" />
-                    </sequence>
-            </complexType>
-            
-            <element name="stockQuoteOffer">
-                <complexType>
-                    <sequence>
-                        <element name="input" minOccurs="0" type="tns:StockOffer" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="stockQuoteOfferResponse">
-                <complexType>
-                    <sequence>
-                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <!-- Faults -->
-            <element name="InvalidSymbolFault">
-                <complexType>
-                    <sequence>
-                        <element name="message"  minOccurs="1" type="xsd:string" />
-                        <element name="offer" minOccurs="1" type="tns:StockOffer" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <element name="MarketClosedFault">
-                <complexType>
-                    <sequence>
-                        <element name="message"  minOccurs="1" type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index 3371f63e4a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,93 +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.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.osoa.sca.ServiceRuntimeException;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
-    private SCADomain domain;
-
-    private StockTraderSDO stockTrader;
-
-    public void testTrading() {
-        try {
-            StockOffer sp = stockTrader.testTrading();
-            assertNotNull(sp);
-            assertEquals(99.00F, sp.getPrice());
-            assertEquals("IBM", sp.getSymbol());
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            fail(e + "");
-
-        }
-
-    }
-
-    public void testInvalidSymbolSDOException() {
-        try {
-            stockTrader.testInvalidSymbolSDOException();
-            fail("Expected InvalidSymbolSDOException");
-        } catch (InvalidSymbolSDOException e) {
-            InvalidSymbolFault isf = e.getFaultInfo();
-
-            assertNotNull(isf);
-            StockOffer sp = isf.getOffer();
-            assertEquals(11.00F, sp.getPrice());
-            assertEquals("IBM0", sp.getSymbol());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Expected InvalidSymbolSDOException" + e);
-
-        }
-    }
-
-    public void testNotDeclaredAtSourceException() {
-
-        Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("ExceptionTest.composite");
-        stockTrader = domain.getService(StockTraderSDO.class, "stockTraderSDOComponent");
-        assertNotNull(stockTrader);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/pom.xml
deleted file mode 100644
index 95665d65e0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-exceptions-simple-ws</artifactId>
-    <name>Apache Tuscany Test for Simple Exceptions over Web Services</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
deleted file mode 100644
index 764f31b7cd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ /dev/null
@@ -1,43 +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 com.example;
-
-public class BusinessException extends Exception {
-
-    private String clientName;
-
-    public BusinessException(String message) {
-        super(message);
-    }
-
-    public BusinessException(String message, String clientName) {
-        super(message);
-        this.clientName = clientName;
-    }
-
-    public String getClientName() {
-        return clientName;
-    }
-
-    public void setClientName(String clientName) {
-        this.clientName = clientName;
-    }
-
-}
-
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index 0c72b52ed9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ /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.    
- */
-package com.example;
-
-public interface ExampleClient {
-    void runTest();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index d6545b5a23..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
+++ /dev/null
@@ -1,44 +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 com.example;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ExampleClient.class)
-@Scope("COMPOSITE")
-public class ExampleClientImpl implements ExampleClient {
-
-    private ExampleService myService;
-
-    @Reference
-    public void setMyService(ExampleService myService) {
-        this.myService = myService;
-    }
-
-    public void runTest() {
-        try {
-            Object result = myService.hello("John");
-            System.out.println("myService returned " + result.getClass().getName());
-        } catch (BusinessException e) {
-            System.out.println("caught exception from hello(): " + e.getMessage() + " for " + e.getClientName());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 30ea559694..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.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 com.example;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExampleService {
-
-	String hello(String name) throws BusinessException;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index b3b6f033e5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ /dev/null
@@ -1,26 +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 com.example;
-
-public class ExampleServiceImpl implements ExampleService {
-    public String hello(String name) throws BusinessException {
-        throw new BusinessException("bad news", name);
-        // return "Hello, " + name;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/resources/example.composite b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/resources/example.composite
deleted file mode 100644
index ad9877140b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ /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.    

--->

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

-           targetNamespace="http://www.example.com"

-           xmlns:hw="http://www.example.com"

-           name="example">

-

-    <component name="ExampleClientComponent">

-        <implementation.java class="com.example.ExampleClientImpl" />

-        <reference name="myService">

-            <interface.wsdl interface="http://example.com/#wsdl.interface(ExampleServicePortType)" />

-            <binding.ws wsdlElement="http://example.com/#wsdl.port(ExampleService/ExampleServiceSOAP11port_http)" />

-        </reference>

-    </component>

-

-    <component name="ExampleComponent">

-        <implementation.java class="com.example.ExampleServiceImpl"/>

-        <service name="ExampleService">

-            <interface.wsdl interface="http://example.com/#wsdl.interface(ExampleServicePortType)" />

-            <binding.ws wsdlElement="http://example.com/#wsdl.port(ExampleService/ExampleServiceSOAP11port_http)" />

-        </service>  

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
deleted file mode 100644
index 628e6ca6ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ /dev/null
@@ -1,126 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"

-    xmlns:ns0="http://example.com/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"

-    xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ns1="http://example.com/xsd"

-    xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema"

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://example.com/">

-    <wsdl:types>

-        <xs:schema xmlns:ns="http://example.com/" attributeFormDefault="qualified" elementFormDefault="qualified"

-            targetNamespace="http://example.com/">

-            <xs:complexType name="Exception">

-                <xs:sequence>

-                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType" />

-                </xs:sequence>

-            </xs:complexType>

-            <xs:element name="BusinessException">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="BusinessException" nillable="true" type="ns1:BusinessException" />

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="hello">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string" />

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="helloResponse">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-        </xs:schema>

-    </wsdl:types>

-    <wsdl:message name="helloRequest">

-        <wsdl:part name="parameters" element="ns0:hello" />

-    </wsdl:message>

-    <wsdl:message name="helloResponse">

-        <wsdl:part name="parameters" element="ns0:helloResponse" />

-    </wsdl:message>

-    <wsdl:message name="BusinessException">

-        <wsdl:part name="parameters" element="ns0:BusinessException" />

-    </wsdl:message>

-    <wsdl:portType name="ExampleServicePortType">

-        <wsdl:operation name="hello">

-            <wsdl:input message="ns0:helloRequest" wsaw:Action="urn:hello" />

-            <wsdl:output message="ns0:helloResponse" wsaw:Action="urn:helloResponse" />

-            <wsdl:fault message="ns0:BusinessException" name="BusinessException"

-                wsaw:Action="urn:helloBusinessException" />

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="ExampleServiceSOAP11Binding" type="ns0:ExampleServicePortType">

-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />

-        <wsdl:operation name="hello">

-            <soap:operation soapAction="urn:hello" style="document" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="BusinessException">

-                <soap:fault use="literal" name="BusinessException" />

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:binding name="ExampleServiceSOAP12Binding" type="ns0:ExampleServicePortType">

-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />

-        <wsdl:operation name="hello">

-            <soap12:operation soapAction="urn:hello" style="document" />

-            <wsdl:input>

-                <soap12:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap12:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="BusinessException">

-                <soap12:fault use="literal" name="BusinessException" />

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:binding name="ExampleServiceHttpBinding" type="ns0:ExampleServicePortType">

-        <http:binding verb="POST" />

-        <wsdl:operation name="hello">

-            <http:operation location="ExampleService/hello" />

-            <wsdl:input>

-                <mime:content type="text/xml" part="hello" />

-            </wsdl:input>

-            <wsdl:output>

-                <mime:content type="text/xml" part="hello" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="ExampleService">

-        <wsdl:port name="ExampleServiceSOAP11port_http" binding="ns0:ExampleServiceSOAP11Binding">

-            <soap:address location="http://localhost:8085/axis2/services/ExampleService" />

-        </wsdl:port>

-        <wsdl:port name="ExampleServiceSOAP12port_http" binding="ns0:ExampleServiceSOAP12Binding">

-            <soap12:address location="http://localhost:8085/axis2/services/ExampleService" />

-        </wsdl:port>

-        <wsdl:port name="ExampleServiceHttpport" binding="ns0:ExampleServiceHttpBinding">

-            <http:address location="http://localhost:8085/axis2/services/ExampleService" />

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 740af4f43d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
+++ /dev/null
@@ -1,44 +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 com.example;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExampleTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private ExampleClient client;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("example.composite");
-        client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        client.runTest();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/pom.xml b/tags/java/sca/1.3-RC1a/itest/exceptions/pom.xml
deleted file mode 100644
index 30e1bb5d01..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-exceptions</artifactId>
-    <name>Apache Tuscany SCA Exceptions Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
deleted file mode 100644
index b95b0ccb31..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ /dev/null
@@ -1,58 +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.test.exceptions;
-
-
-public class Checked extends Exception {
-    private static final long serialVersionUID = -129752837478357452L;
-
-    /**
-     * 
-     */
-    public Checked() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public Checked(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public Checked(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public Checked(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
deleted file mode 100644
index 5740e053a9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ /dev/null
@@ -1,32 +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.test.exceptions;
-
-public interface ExceptionHandler {
-
-    public void testing();
-
-    public Checked getTheBad();
-
-    public String getTheGood();
-
-    public UnChecked getTheUgly();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
deleted file mode 100644
index f923133ee9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ /dev/null
@@ -1,30 +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.test.exceptions;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Remote exception thrower
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ExceptionRemoteThrower extends ExceptionThrower {
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
deleted file mode 100644
index 55d81102d2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.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 org.apache.tuscany.sca.test.exceptions;
-
-
-/**
- * Local exception thrower
- * @version $Rev$ $Date$
- */
-public interface ExceptionThrower {
-    public static final Checked BAD = new Checked("theBad");
-    public static final UnChecked UGLY = new UnChecked("theUgly");
-    public static final String SO_THEY_SAY = "All is good that ends good.";
-
-    public String theGood() throws Checked;
-
-    public String theBad() throws Checked;
-
-    public String theUgly() throws Checked;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
deleted file mode 100644
index 453528444d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ /dev/null
@@ -1,57 +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.test.exceptions;
-
-public class UnChecked extends RuntimeException {
-    private static final long serialVersionUID = -1318118082838092244L;
-
-    /**
-     * 
-     */
-    public UnChecked() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public UnChecked(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public UnChecked(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public UnChecked(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
deleted file mode 100644
index 1987490a0a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ /dev/null
@@ -1,115 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ExceptionHandlerImpl implements ExceptionHandler {
-    static final String INIT = "INIT";
-
-    private ExceptionThrower exceptionThrower;
-
-    private String theGood;
-
-    private Checked theBad;
-
-    private UnChecked theUgly;
-
-    public void testing() {
-
-        assert exceptionThrower != null : "'exceptionThrower' never wired";
-        String result = INIT;
-        try {
-            theGood = result = exceptionThrower.theGood();
-            assert result == ExceptionThrower.SO_THEY_SAY;
-        } catch (Throwable e) {
-            assert result == INIT;
-            assert false;
-            e.printStackTrace();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theBad();
-            // incredible
-            assert false : "Expected 'Check' Exception";
-
-        } catch (Checked e) {
-            // This is good...
-            assert result == INIT;
-            theBad = e;
-        } catch (Throwable t) {
-            // This is not so good.
-            t.printStackTrace();
-            assert result == INIT;
-            assert false : "Got wrong exception '" + t.getClass().getName();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theUgly();
-            // incredible
-            assert false : "Expected 'UnCheck' Exception";
-
-        } catch (Checked e) {
-            // This is not so good...
-            assert false : "Got wrong exception '" + e.getClass().getName();
-            assert result == INIT;
-        } catch (UnChecked e) {
-            theUgly = e;
-
-        } catch (Throwable t) {
-            // This is not good.
-            assert false;
-            assert result == INIT;
-
-            System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
-        }
-
-    }
-
-    @Reference 
-    public void setExceptionThrower(ExceptionThrower exceptionThrower) {
-        this.exceptionThrower = exceptionThrower;
-    }
-
-    public String getTheGood() {
-        return theGood;
-    }
-
-    public Checked getTheBad() {
-        return theBad;
-    }
-
-    public UnChecked getTheUgly() {
-        return theUgly;
-    }
-
-    public ExceptionThrower getExceptionThrower() {
-        return exceptionThrower;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
deleted file mode 100644
index c4cb52f94c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ /dev/null
@@ -1,44 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-@Service(ExceptionRemoteThrower.class)
-public class ExceptionRemoteThrowerImpl implements ExceptionRemoteThrower {
-    public String theBad() throws Checked {
-        throw BAD;
-    }
-
-    public String theGood() throws Checked {
-        return SO_THEY_SAY;
-    }
-
-    public String theUgly() throws Checked {
-        throw UGLY;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
deleted file mode 100644
index cf8740ba56..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.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 org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-@Service(ExceptionThrower.class)
-public class ExceptionThrowerImpl implements ExceptionThrower {
-
-    public String theBad() throws Checked {
-        throw BAD;
-    }
-
-    public String theGood() throws Checked {
-        return SO_THEY_SAY;
-    }
-
-    public String theUgly() throws Checked {
-        throw UGLY;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
deleted file mode 100644
index f82a30d529..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ /dev/null
@@ -1,116 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class RemoteExceptionHandlerImpl implements ExceptionHandler {
-    static final String INIT = "INIT";
-
-    private ExceptionRemoteThrower exceptionThrower;
-
-    private String theGood;
-
-    private Checked theBad;
-
-    private UnChecked theUgly;
-
-    public void testing() {
-
-        assert exceptionThrower != null : "'exceptionThrower' never wired";
-        String result = INIT;
-        try {
-            theGood = result = exceptionThrower.theGood();
-            assert result == ExceptionThrower.SO_THEY_SAY;
-        } catch (Throwable e) {
-            assert result == INIT;
-            assert false;
-            e.printStackTrace();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theBad();
-            // incredible
-            assert false : "Expected 'Check' Exception";
-
-        } catch (Checked e) {
-            // This is good...
-            assert result == INIT;
-            theBad = e;
-        } catch (Throwable t) {
-            // This is not so good.
-            t.printStackTrace();
-            assert result == INIT;
-            assert false : "Got wrong exception '" + t.getClass().getName();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theUgly();
-            // incredible
-            assert false : "Expected 'UnCheck' Exception";
-
-        } catch (Checked e) {
-            // This is not so good...
-            assert false : "Got wrong exception '" + e.getClass().getName();
-            assert result == INIT;
-        } catch (UnChecked e) {
-            theUgly = e;
-
-        } catch (Throwable t) {
-            // This is not good.
-            assert false;
-            assert result == INIT;
-
-            System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
-        }
-
-    }
-
-    @Reference 
-    public void setExceptionThrower(ExceptionRemoteThrower exceptionThrower) {
-        this.exceptionThrower = exceptionThrower;
-    }
-
-    public String getTheGood() {
-        return theGood;
-    }
-
-    public Checked getTheBad() {
-        return theBad;
-    }
-
-    public UnChecked getTheUgly() {
-        return theUgly;
-    }
-
-    public ExceptionRemoteThrower getExceptionThrower() {
-        return exceptionThrower;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index d27797c2fe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
-  name="ExceptionTest">
-  <component name="main">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" />
-    <reference name="exceptionThrower" target="exceptionThrower" />
-  </component>
-
-  <component name="exceptionThrower">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionThrowerImpl" />
-  </component>
-
-  <component name="mainRemote">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.RemoteExceptionHandlerImpl" />
-    <reference name="exceptionThrower" target="exceptionThrowerRemote" />
-  </component>
-
-  <component name="exceptionThrowerRemote">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionRemoteThrowerImpl" />
-  </component>
-
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/tags/java/sca/1.3-RC1a/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
deleted file mode 100644
index f84205c096..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ /dev/null
@@ -1,73 +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.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExceptionsTestCase extends TestCase {
-
-    private SCADomain domain;
-
-    /**
-     * Test exception handling over a local interface
-     */
-    public void testLocal() {
-        ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "main");
-        exceptionHandler.testing();
-        assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
-        assertNotNull(exceptionHandler.getTheBad());
-        assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
-        assertSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
-        assertNotNull(exceptionHandler.getTheUgly());
-        assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
-        assertSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
-    }
-    
-    /**
-     * Test exception handling over a remotable interface
-     */
-    public void testRemote() {
-        ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "mainRemote");
-        exceptionHandler.testing();
-        assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
-        assertNotNull(exceptionHandler.getTheBad());
-        assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
-        assertNotSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
-        assertNotNull(exceptionHandler.getTheUgly());
-        assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
-        
-        // [rfeng] We're not in a position to copy non business exceptions
-        // assertNotSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
-
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-    	domain = SCADomain.newInstance("ExceptionTest.composite");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/pom.xml b/tags/java/sca/1.3-RC1a/itest/extended-api/pom.xml
deleted file mode 100644
index 52724657f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-extended-api</artifactId>
-    <name>Apache Tuscany SCA Extended API Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            
-            <groupId>org.apache.tuscany.sca</groupId>
-            
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            
-            <version>1.3</version>
-            
-            <scope>runtime</scope>
-        
-        </dependency>
-    
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
deleted file mode 100644
index 869565af17..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ /dev/null
@@ -1,26 +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.test.extended;
-
-public interface BasicService {
-
-    int negate(int theInt);
-    int delegateNegate(int theInt);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
deleted file mode 100644
index c54af93c05..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.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 org.apache.tuscany.sca.test.extended;
-
-public interface MathService {
-
-    int negate(int theInt);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
deleted file mode 100644
index 523d238f2e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.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 org.apache.tuscany.sca.test.extended.impl;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.extended.BasicService;
-import org.apache.tuscany.sca.test.extended.MathService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(BasicService.class)
-public class BasicServiceImpl implements BasicService {
-
-    @Context
-    protected ComponentContext context;
-    
-    public int negate(int theInt) {
-        return -theInt;
-    }
-
-    public int delegateNegate(int theInt) {
-        SCADomain domain = SCADomain.connect("sca://local");
-        MathService service = domain.getService(MathService.class, "MathServiceComponent");
-        return service.negate(theInt);       
-    }
-
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
deleted file mode 100644
index ab4300a7dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ /dev/null
@@ -1,31 +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.test.extended.impl;
-
-import org.apache.tuscany.sca.test.extended.MathService;
-import org.osoa.sca.annotations.Service;
-
-@Service(MathService.class)
-public class MathServiceImpl implements MathService {
-
-    public int negate(int theInt) {
-        return -theInt;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/resources/BasicService.composite b/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/resources/BasicService.composite
deleted file mode 100644
index 128b33b16f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/resources/BasicService.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://www.osoa.org/xmlns/sca/1.0"

-	   xmlns:foo="http://foo" 

-	   targetNamespace="http://foo"

-           name="BasicServiceComposite">

-   

-    <component name="BasicServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.extended.impl.BasicServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/resources/MathService.composite b/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/resources/MathService.composite
deleted file mode 100644
index 8e99d3da60..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/main/resources/MathService.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://www.osoa.org/xmlns/sca/1.0"

-	   xmlns:foo="http://foo" 

-	   targetNamespace="http://foo"

-           name="MathServiceComposite">

-   

-    <component name="MathServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.extended.impl.MathServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/tags/java/sca/1.3-RC1a/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
deleted file mode 100644
index c480235d88..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ /dev/null
@@ -1,73 +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.test.extended;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class ServiceLocateTestCase {
-
-    private SCADomain domain;
-
-    /**
-     * Test description: Locate a service using Domain.getService() from an
-     * unmanaged client and invoke a method on that service
-     */
-    @Test
-    public void unmanagedLocateService() {
-        BasicService service = domain.getService(BasicService.class, "BasicServiceComponent");
-        assertEquals(-99, service.negate(99));
-    }
-
-    /**
-     * Test description: Locate a service using Domain.getService() from an
-     * managed client.  A service is located from this unmanaged test client and a method
-     * is invoked.  The method implementation of the service will also use Domain.getService
-     */
-    @Test
-    public void managedLocateService() {
-        BasicService service = domain.getService(BasicService.class, "BasicServiceComponent");
-        assertEquals(-99, service.delegateNegate(99));
-    }
-
-    /**
-     * Test description: Attempt to locate a service with an invalid name.
-     */
-    @Test(expected = ServiceRuntimeException.class)
-    public void badComponentName() {
-        BasicService service = domain.getService(BasicService.class, "IvalidServiceName");
-        service.negate(-1);
-    }
-
-    @Before
-    public void init() throws Exception {
-        domain = SCADomain.newInstance("http://localhost", "/", "BasicService.composite", "MathService.composite");
-    }
-
-    @After
-    public void destroy() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/pom.xml b/tags/java/sca/1.3-RC1a/itest/interfaces/pom.xml
deleted file mode 100644
index 8769e02cde..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/pom.xml
+++ /dev/null
@@ -1,46 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-interfaces</artifactId>
-    <name>Apache Tuscany Interface Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
deleted file mode 100644
index 5bc872ef83..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ /dev/null
@@ -1,31 +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.itest.interfaces;
-
-
-/**
- * only for callBack
- */
-public interface LocalCallbackInterface {
-
-    public void callbackMethod(String str);
-
-    public void modifyParameter(ParameterObject po);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
deleted file mode 100644
index 7bfcf5de11..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ /dev/null
@@ -1,47 +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.itest.interfaces;
-
-import org.osoa.sca.annotations.OneWay;
-
-/*
- * itest for interface: local,method-overloading
- */
-public interface LocalClientComponent {
-
-    String foo1(ParameterObject po);
-
-    String foo1(String str) throws Exception;
-
-    String foo2(String str, int i);
-
-    String foo2(int i, String str) throws Exception;
-
-    void callback(String str);
-
-    void callModifyParameter();
-
-    @OneWay
-    void onewayMethod(String str);
-
-    String getCallbackValue();
-
-    String getOnewayValue();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
deleted file mode 100644
index d4f7694e8f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ /dev/null
@@ -1,83 +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.itest.interfaces;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(LocalClientComponent.class)
-public class LocalClientComponentImpl implements LocalClientComponent, LocalCallbackInterface {
-
-    @Reference
-    protected LocalServiceComponent aCallBackService;
-    private static String callbackValue;
-    private static String onewayValue;
-
-    public String foo1(ParameterObject po) {
-        po.field1 = "AComponent";
-        return "AComponent";
-    }
-
-    public String foo1(String str) throws Exception {
-        return str + "AComponent";
-    }
-
-    public String foo2(String str, int i) {
-        return str + "AComponent" + i;
-    }
-
-    public String foo2(int i, String str) throws Exception {
-        return str + "AComponent" + i;
-    }
-
-    public void callback(String str) {
-        aCallBackService.callback(str);
-    }
-
-    public void callbackMethod(String str) {
-        callbackValue = str;
-    }
-
-    public void callModifyParameter() {
-        this.aCallBackService.modifyParameter();
-    }
-
-    public String getCallbackValue() {
-        return callbackValue;
-    }
-
-    public void onewayMethod(String str) {
-        onewayValue = str;
-        try {
-            Thread.sleep(200);
-        } catch (Exception e) {
-            //do nothing
-        }
-    }
-
-    public String getOnewayValue() {
-        return onewayValue;
-    }
-
-    public void modifyParameter(ParameterObject po) {
-        po.field1 = "AComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
deleted file mode 100644
index 4772303fab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-
-/**
- * Local be-directional callBackService
- */
-@Callback(LocalCallbackInterface.class)
-public interface LocalServiceComponent {
-
-    String foo(String str);
-
-    void callback(String str);
-
-    void modifyParameter();
-
-    ParameterObject getPO();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
deleted file mode 100644
index e100636b23..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ /dev/null
@@ -1,49 +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.itest.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(LocalServiceComponent.class)
-public class LocalServiceComponentImpl implements LocalServiceComponent {
-
-    @Callback
-    protected LocalCallbackInterface callback;
-
-    private static ParameterObject po;
-
-    public void callback(String str) {
-        callback.callbackMethod(str);
-    }
-
-    public void modifyParameter() {
-        po = new ParameterObject("CallBack");
-        callback.modifyParameter(po);
-    }
-
-    public String foo(String str) {
-        return str;
-    }
-
-    public ParameterObject getPO() {
-        return po;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
deleted file mode 100644
index 0bc8d10904..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ /dev/null
@@ -1,47 +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.itest.interfaces;
-
-import java.io.Serializable;
-
-public class ParameterObject implements Serializable {
-    private static final long serialVersionUID = 1L;
-    public String field1;
-
-    public ParameterObject() {
-        this.field1 = null;
-    }
-
-    public ParameterObject(String field1) {
-        this.field1 = field1;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-        if (o instanceof ParameterObject) {
-            ParameterObject other = (ParameterObject)o;
-            if (field1 != null)
-                return field1.equals(other.field1);
-        }
-        return false;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
deleted file mode 100644
index e2b70313ed..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ /dev/null
@@ -1,33 +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.itest.interfaces;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * only for callBack
- */
-@Remotable
-public interface RemoteCallbackInterface {
-
-    public void callbackMethod(String str);
-
-    public void modifyParameter(ParameterObject po);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
deleted file mode 100644
index dd591eabeb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ /dev/null
@@ -1,63 +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.    
- */
-/*
- * 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.itest.interfaces;
-
-import org.osoa.sca.annotations.Remotable;
-
-/*  
- * different signatures  
- */
-
-@Remotable
-public interface RemoteClientComponent {
-
-    String foo1(ParameterObject po);
-    String foo3(ParameterObject po);
-
-    String foo2(int i, String str1) throws Exception;
-
-    void callback(String str);
-
-    void callModifyParameter();
-
-    String getCallbackValue();
-
-    void onewayMethod(String str);
-
-    String getOnewayValue();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
deleted file mode 100644
index d4731f35d3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ /dev/null
@@ -1,81 +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.itest.interfaces;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(RemoteClientComponent.class)
-public class RemoteClientComponentImpl implements RemoteClientComponent, RemoteCallbackInterface {
-
-    @Reference
-    protected RemoteServiceComponent aCallBackService;
-    private static String callbackValue;
-    private static String onewayValue;
-
-    public String foo1(ParameterObject po) {
-        po.field1 = "BComponent";
-        return "BComponent";
-    }
-
-    @AllowsPassByReference
-    public String foo3(ParameterObject po) {
-        po.field1 = "BComponent";
-        return "BComponent";
-    }
-    
-    public String foo2(int i, String str) throws Exception {
-        return str + "BComponent" + i;
-    }
-
-    public void callback(String str) {
-        aCallBackService.callback(str);
-    }
-
-    public void callModifyParameter() {
-        this.aCallBackService.modifyParameter();
-    }
-
-    public void callbackMethod(String str) {
-        callbackValue = str;
-    }
-
-    public String getCallbackValue() {
-        return callbackValue;
-    }
-
-    public void onewayMethod(String str) {
-        onewayValue = str;
-        try {
-            Thread.sleep(200);
-        } catch (Exception e) {
-            //do nothing
-        }
-    }
-
-    public String getOnewayValue() {
-        return onewayValue;
-    }
-
-    public void modifyParameter(ParameterObject po) {
-        po.field1 = "BComponent";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
deleted file mode 100644
index 6c40db0e70..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.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 org.apache.tuscany.sca.itest.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(RemoteCallbackInterface.class)
-public interface RemoteServiceComponent {
-
-    String foo(String str);
-
-    void callback(String str);
-
-    void modifyParameter();
-
-    ParameterObject getPO();
-    
-    String[] bar(int[][] intArray);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
deleted file mode 100644
index 3804d31902..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ /dev/null
@@ -1,54 +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.itest.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(RemoteServiceComponent.class)
-public class RemoteServiceComponentImpl implements RemoteServiceComponent {
-
-    @Callback
-    protected RemoteCallbackInterface callback;
-
-    private static ParameterObject po;
-
-    public void callback(String str) {
-        callback.callbackMethod(str);
-    }
-
-    public void modifyParameter() {
-        po = new ParameterObject("CallBack");
-        callback.modifyParameter(po);
-    }
-
-    public String foo(String str) {
-        return str;
-    }
-
-    public ParameterObject getPO() {
-        return po;
-    }
-
-    public String[] bar(int[][] intArray) {
-        return new String[] {"int"};
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/resources/InterfacesTest.composite b/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/resources/InterfacesTest.composite
deleted file mode 100644
index 0361d8c83c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ /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

-    * 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:foo="http://foo" targetNamespace="http://foo"

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

-

-    <component name="LocalClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" />

-        <reference name="aCallBackService" target="LocalServiceComponent" />

-    </component>

-

-    <component name="RemoteClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteClientComponentImpl" />

-        <reference name="aCallBackService" target="RemoteServiceComponent" />

-    </component>

-

-    <component name="LocalServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalServiceComponentImpl" />

-    </component>

-

-    <component name="RemoteServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteServiceComponentImpl" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/tags/java/sca/1.3-RC1a/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
deleted file mode 100644
index 013cdd4f15..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ /dev/null
@@ -1,126 +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.itest.interfaces;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class InterfacesTestCase {
-    private static SCADomain domain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("InterfacesTest.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testLocalClient() {
-        LocalServiceComponent service = domain.getService(LocalServiceComponent.class, "LocalServiceComponent");
-        LocalClientComponent local = domain.getService(LocalClientComponent.class, "LocalClientComponent");
-
-        try {
-            ParameterObject po = new ParameterObject();
-            assertEquals("AComponent", local.foo1(po));
-            assertEquals("AComponent", po.field1);
-
-            assertEquals("AAComponent", local.foo1("A"));
-
-            assertEquals("AAComponent1", local.foo2("A", 1));
-            assertEquals("AAComponent1", local.foo2(1, "A"));
-        } catch (Exception e) {
-            fail();
-        }
-
-        try {
-            // test local callback
-            local.callback("CallBack");
-            Thread.sleep(100);
-            assertEquals("CallBack", local.getCallbackValue());
-
-            local.callModifyParameter();
-            Thread.sleep(100);
-            assertEquals("AComponent", service.getPO().field1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("CallBack failed");
-        }
-
-        try {
-            local.onewayMethod("OneWay");
-            Thread.sleep(100);
-            assertEquals("OneWay", local.getOnewayValue());
-        } catch (Exception e) {
-            fail("OneWay failed");
-        }
-    }
-
-    @Test
-    public void testRemoteClient() {
-        RemoteServiceComponent service = domain.getService(RemoteServiceComponent.class, "RemoteServiceComponent");
-        RemoteClientComponent remote = domain.getService(RemoteClientComponent.class, "RemoteClientComponent");
-
-        try {
-            // Test Pass By Value
-            ParameterObject po = new ParameterObject("NotBComponent");
-            assertEquals("BComponent", remote.foo1(po));
-            assertEquals("NotBComponent", po.field1);
-
-            assertEquals("BBComponent1", remote.foo2(1, "B"));
-
-            // Test allowsPassByReference
-            assertEquals("BComponent", remote.foo3(po));
-            assertEquals("BComponent", po.field1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-
-        try {
-            remote.callback("CallBack");
-            Thread.sleep(100);
-            assertEquals("CallBack", remote.getCallbackValue());
-
-            remote.callModifyParameter();
-            Thread.sleep(100);
-            assertEquals("CallBack", service.getPO().field1);
-        } catch (Exception e) {
-            fail("CallBack failed");
-        }
-
-        try {
-            remote.onewayMethod("OneWay");
-            Thread.sleep(100);
-            assertEquals("OneWay", remote.getOnewayValue());
-        } catch (Exception e) {
-            fail("OneWay failed");
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/pom.xml b/tags/java/sca/1.3-RC1a/itest/jms/pom.xml
deleted file mode 100644
index 55d1f7c808..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/pom.xml
+++ /dev/null
@@ -1,85 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-jms</artifactId>
-    <name>Apache Tuscany SCA JMS Tests</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
deleted file mode 100644
index 7b1c63d437..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.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 org.apache.tuscany.sca.binding.jms;
-
-public class CheckedExcpetion extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    public CheckedExcpetion(String s) {
-        super(s);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
deleted file mode 100644
index 46bf911def..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ /dev/null
@@ -1,30 +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.binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExceptionService {
-
-    public void throwChecked() throws CheckedExcpetion;
-
-    public void throwUnChecked();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
deleted file mode 100644
index cd3c09e17f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.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 org.apache.tuscany.sca.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(ExceptionService.class)
-public class ExceptionServiceClient implements ExceptionService {
-
-    private ExceptionService service;
-
-    @Reference
-    public void setService(ExceptionService service) {
-        this.service = service;
-    }
-
-    public void throwChecked() throws CheckedExcpetion {
-        service.throwChecked();
-    }
-
-    public void throwUnChecked() {
-        service.throwUnChecked();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
deleted file mode 100644
index ab293a5df1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ /dev/null
@@ -1,32 +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.binding.jms;
-
-public class ExceptionServiceImpl implements ExceptionService {
-
-    public void throwChecked() throws CheckedExcpetion {
-        throw new CheckedExcpetion("foo");
-    }
-
-    public void throwUnChecked() {
-        throw new RuntimeException("bla");
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index 86d4719646..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
-    private HelloWorldService serviceA;
-
-    @Reference
-    public void setServiceA(HelloWorldService service) {
-        this.serviceA = service;
-    }
-
-    public String sayHello(String name) {
-        return serviceA.sayHello(name);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index abb29aec4c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ /dev/null
@@ -1,26 +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.binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index 21d2de2cf0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        if ("bang".equals(name)) {
-            throw new RuntimeException("blem wit");
-        }
-        return "jmsHello " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
deleted file mode 100644
index 218cccf64c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
-    private OneWayService serviceA;
-
-    @Reference
-    public void setServiceA(OneWayService service) {
-        this.serviceA = service;
-    }
-
-    public void sayHello(String name) {
-        serviceA.sayHello(name);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
deleted file mode 100644
index 9795089952..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
-    @OneWay
-    void sayHello(Object name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
deleted file mode 100644
index 25a89fc5b4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ /dev/null
@@ -1,34 +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.binding.jms;
-
-public class OneWayObjectServiceImpl implements OneWayObjectService {
-
-    public static Object mutex = new Object();
-    public static Object name;
-
-    public void sayHello(Object name) {
-        OneWayObjectServiceImpl.name = name;
-        synchronized (OneWayObjectServiceImpl.mutex) {
-            OneWayObjectServiceImpl.mutex.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index f16f853ba7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface OneWayService {
-    
-    @OneWay
-    void sayHello(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index bff4536fa0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ /dev/null
@@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
-    public static Object mutex = new Object();
-    public static String name;
-    
-    public void sayHello(String name) {
-        OneWayServiceImpl.name = name;
-        synchronized (OneWayServiceImpl.mutex) {
-            OneWayServiceImpl.mutex.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
deleted file mode 100644
index cfe7a649d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ /dev/null
@@ -1,57 +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.binding.jms;
-
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-
-public class TestMessageProcessor extends XMLTextMessageProcessor {
-
-    public static boolean insertPayloadIntoJMSMessageCalled;
-    public static boolean extractPayloadFromJMSMessageCalled;
-    public static boolean setOperationNameCalled;
-    
-    public TestMessageProcessor(JMSBinding jmsBinding) {
-        super(jmsBinding);
-    }
-    public Object extractPayloadFromJMSMessage(Message message) {
-        extractPayloadFromJMSMessageCalled = true;
-        return super.extractPayloadFromJMSMessage(message);
-    }
-
-    public String getOperationName(Message message) {
-        // is this used?
-        return super.getOperationName(message);
-    }
-
-    public Message insertPayloadIntoJMSMessage(Session session, Object payload) {
-        insertPayloadIntoJMSMessageCalled = true;
-        return super.insertPayloadIntoJMSMessage(session, payload);
-    }
-
-    public void setOperationName(String operationName, Message message) {
-        setOperationNameCalled = true;
-        super.setOperationName(operationName, message);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/defaults/client.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/defaults/client.composite
deleted file mode 100644
index 02c04e6afd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/defaults/client.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms uri="jms:HelloWorldService" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/defaults/service.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/defaults/service.composite
deleted file mode 100644
index 45c1819e2b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/defaults/service.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/dynamic/client.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/dynamic/client.composite
deleted file mode 100644
index 494fe9790f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/dynamic/client.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms>

-            <destination name="DestQueueA"/>

-            <!-- No response destination defined means a temporary queue will be used -->

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/exceptions/client.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/exceptions/client.composite
deleted file mode 100644
index 8bb7f86252..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/exceptions/client.composite
+++ /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.    

- -->

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

-           name="ExceptionClientComposite">

-

-    <component name="ExceptionServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceClient"/>

-        <reference name="service" />

-    </component>

-

-    <reference name="service" promote="ExceptionServiceClient/service">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.ExceptionService" />

-        <binding.jms uri="jms:ExceptionService" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/exceptions/service.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/exceptions/service.composite
deleted file mode 100644
index 052ff9d985..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/exceptions/service.composite
+++ /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.    

- -->

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

-           name="ExceptionServiceComposite">

-

-    <component name="ExceptionService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>

-        <service name="ExceptionService">

-            <binding.jms />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/external/client.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/external/client.composite
deleted file mode 100644
index dcea428493..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/external/client.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/external/service.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/external/service.composite
deleted file mode 100644
index 44b7b29610..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/external/service.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://www.osoa.org/xmlns/sca/1.0"

-           name="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/jndi.properties b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/jndi.properties
+++ /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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/nonSCAclient/service.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index 584a44dc4b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

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

-           name="RPCComposite">

-

-    <component name="DefaultService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61618"

-                         messageProcessor="XMLTextMessage">

-            </binding.jms>

-        </service>

-    </component>

-

-    <component name="TextService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61618"

-                         messageProcessor="TextMessage"

-                         uri="jms:TextDest" />

-        </service>

-    </component>

-

-    <component name="ObjectService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>

-        <service name="OneWayObjectService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61618"

-                         messageProcessor="ObjectMessage"

-                         uri="jms:ObjectDest" />

-        </service>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/oneway/OneWayClient.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/oneway/OneWayClient.composite
deleted file mode 100644
index cd9a62ee6f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/oneway/OneWayClient.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://www.osoa.org/xmlns/sca/1.0"

-           name="OneWayComposite">

-

-    <component name="OneWayClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="OneWayClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />

-        <binding.jms>

-            <destination name="DestQueueA"/>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/oneway/OneWayService.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/oneway/OneWayService.composite
deleted file mode 100644
index 3c53881141..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/oneway/OneWayService.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://www.osoa.org/xmlns/sca/1.0"

-           name="OneWayComposite">

-

-    <component name="OneWayService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms>

-               <destination name="DestQueueA" create="always"/>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/client.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/client.composite
deleted file mode 100644
index 3f5229a30c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/client.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms>

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/mpclient.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/mpclient.composite
deleted file mode 100644
index 2c8dc463e0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/mpclient.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/service.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/service.composite
deleted file mode 100644
index 47200f9005..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/service.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://www.osoa.org/xmlns/sca/1.0"

-           name="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms>

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/uriclient.composite b/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/uriclient.composite
deleted file mode 100644
index a6c9ee3822..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/main/resources/simple/uriclient.composite
+++ /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.    

- -->

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

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms uri="jms:DestQueueA" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
deleted file mode 100644
index dca9386637..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ /dev/null
@@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DefaultsTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "defaults/client.composite", "defaults/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
deleted file mode 100644
index 41fbf04c0a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ /dev/null
@@ -1,53 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DynamicReplyQTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/dynamic", "dynamic/client.composite", "simple/service.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Beate", helloWorldService.sayHello("Beate"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
deleted file mode 100644
index 051be93f22..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ /dev/null
@@ -1,70 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class ExceptionsTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "exceptions/client.composite", "exceptions/service.composite");
-    }
-
-    @Test
-    public void testChecked() {
-        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
-        try {
-            service.throwChecked();
-            fail();
-        } catch (CheckedExcpetion e) {
-            assertEquals("foo", e.getMessage());
-        }
-    }
-
-    @Test
-    public void testUnChecked() {
-        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
-        try {
-            service.throwUnChecked();
-            fail();
-        } catch (Exception e) {
-            assertEquals("bla", e.getCause().getCause().getMessage());
-        }
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
deleted file mode 100644
index c34ad07901..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ /dev/null
@@ -1,70 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests using the JMS binding with an external JMS broker
- */
-public class ExternalBrokerTestCase {
-
-    private static SCADomain scaDomain;
-    private BrokerService broker;
-
-    @Before
-    public void init() throws Exception {
-        startBroker();
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "external/client.composite", "external/service.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() throws Exception {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-        stopBroker();
-    }
-
-    protected void startBroker() throws Exception {
-        broker = new BrokerService();
-        broker.setPersistent(false);
-        broker.setUseJmx(false);
-        broker.addConnector("tcp://localhost:61616");
-        broker.start();
-    }
-    protected void stopBroker() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
deleted file mode 100644
index 9ec77ca440..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ /dev/null
@@ -1,58 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class MessageProcessorTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/mpclient.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-        assertTrue(TestMessageProcessor.extractPayloadFromJMSMessageCalled);
-        assertTrue(TestMessageProcessor.insertPayloadIntoJMSMessageCalled);
-        assertTrue(TestMessageProcessor.setOperationNameCalled);
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
deleted file mode 100644
index 94581876fd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ /dev/null
@@ -1,139 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class NonSCAClientTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() throws Exception {
-        startBroker();
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "nonSCAclient/service.composite");
-        OneWayServiceImpl.name = null;
-    }
-
-    @Test
-    public void testXMLText() throws Exception {
-
-        synchronized (OneWayServiceImpl.mutex) {
-
-            sendTextMessage("dynamicQueues/OneWayService", "<arg0>Petra</arg0>");
-
-            // wait up to 10 seconds but it will likely be a lot less
-            // as the service invocation will wake this up earlier
-            OneWayServiceImpl.mutex.wait(10000);
-        }
-        assertEquals("Petra", OneWayServiceImpl.name);
-    }
-
-    @Test
-    public void testText() throws Exception {
-
-        synchronized (OneWayServiceImpl.mutex) {
-
-            sendTextMessage("dynamicQueues/TextDest", "Petra");
-
-            // wait up to 10 seconds but it will likely be a lot less
-            // as the service invocation will wake this up earlier
-            OneWayServiceImpl.mutex.wait(10000);
-        }
-        assertEquals("Petra", OneWayServiceImpl.name);
-    }
-
-    @Test
-    public void testObject() throws Exception {
-
-        Set<Integer> arg = new HashSet<Integer>();
-        arg.add(new Integer(3));
-
-        synchronized (OneWayObjectServiceImpl.mutex) {
-
-            sendObjectMessage("dynamicQueues/ObjectDest", arg);
-
-            // wait up to 10 seconds but it will likely be a lot less
-            // as the service invocation will wake this up earlier
-            OneWayObjectServiceImpl.mutex.wait(10000);
-        }
-        assertEquals(arg, OneWayObjectServiceImpl.name);
-    }
-
-    @After
-    public void end() throws Exception {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-        stopBroker();
-    }
-
-    private BrokerService broker;
-    protected void startBroker() throws Exception {
-        broker = new BrokerService();
-        broker.setPersistent(false);
-        broker.setUseJmx(false);
-        broker.addConnector("tcp://localhost:61618");
-        broker.start();
-    }
-    protected void stopBroker() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-    protected static void sendTextMessage(String destName, String payload) throws JMSException, NamingException {
-        JMSResourceFactory rf = new JMSResourceFactory(null, null, "tcp://localhost:61618");
-        Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-        MessageProducer p = session.createProducer(rf.lookupDestination(destName));
-        rf.getConnection().start();
-        session.run();
-        p.send(session.createTextMessage(payload));
-        rf.closeConnection();
-    }
-
-    protected static void sendObjectMessage(String destName, Object payload) throws JMSException, NamingException {
-        JMSResourceFactory rf = new JMSResourceFactory(null, null, "tcp://localhost:61618");
-        Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-        MessageProducer p = session.createProducer(rf.lookupDestination(destName));
-        rf.getConnection().start();
-        session.run();
-        p.send(session.createObjectMessage((Serializable)payload));
-        rf.closeConnection();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
deleted file mode 100644
index 26dda13cf9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ /dev/null
@@ -1,58 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class OneWayTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "oneway/OneWayClient.composite", "oneway/OneWayService.composite");
-    }
-
-    @Test
-    public void testOneWayInvoked() throws Exception {
-        OneWayService oneWayService = scaDomain.getService(OneWayService.class, "OneWayClient");
-        oneWayService.sayHello("Petra");
-        synchronized (OneWayServiceImpl.mutex) {
-            // wait up to 10 seconds but it will likely be a lot less 
-            // as the service invocation will wake this up earlier 
-            OneWayServiceImpl.mutex.wait(10000);
-        }
-        assertEquals("Petra", OneWayServiceImpl.name);
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
deleted file mode 100644
index c1882a1e26..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ /dev/null
@@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class RPCTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
deleted file mode 100644
index bed5515d7f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ /dev/null
@@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class URIRPCTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/uriclient.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/pom.xml
deleted file mode 100644
index 5b1631ab23..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/pom.xml
+++ /dev/null
@@ -1,141 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-large-sdo-ws</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Web Service with Large SDO Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <!-- Declare tuscany-host-tomcat dependency in the default profile so that it can be replaced -->
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
-                    <version>1.3</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <id>generate-ifx-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/IFX170_XSD.xsd</fileName>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                            </schemaFiles>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
deleted file mode 100644
index f5a8830c4a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ /dev/null
@@ -1,43 +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.itest.trninq;
-
-import java.rmi.RemoteException;
-
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrnInqClient implements TrninqInterface {
-
-    //service interface
-    private TrninqInterface transactionInquiryService;
-
-    // setting service interface
-    public void setTransactionInquiryService(TrninqInterface transactionInquiryService) {
-        this.transactionInquiryService = transactionInquiryService;
-    }
-
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type req) throws RemoteException {
-        return transactionInquiryService.DepAcctTrnInq(req);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
deleted file mode 100644
index 14da53cf98..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ /dev/null
@@ -1,112 +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.itest.trninq;
-
-import java.rmi.RemoteException;
-import java.util.List;
-
-import org.ifxforum.xsd._1.AdditionalStatus_Type;
-import org.ifxforum.xsd._1.BankAcctTrnRec_Type;
-import org.ifxforum.xsd._1.BillerId_Type;
-import org.ifxforum.xsd._1.BillerPayee_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.ifxforum.xsd._1.DepAcctTrnRec_Type;
-import org.ifxforum.xsd._1._1Factory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrnInqService implements TrninqInterface {
-
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type req) throws RemoteException {
-
-        DepAcctTrnInqRs_Type response = _1Factory.INSTANCE.createDepAcctTrnInqRs_Type();
-
-        response.setStatus(_1Factory.INSTANCE.createStatus_Type());
-        response.getStatus().setStatusCode(1);
-        response.getStatus().setStatusDesc("the description associated with the code 1");
-        AdditionalStatus_Type addStatus = _1Factory.INSTANCE.createAdditionalStatus_Type();
-        addStatus.setServerStatusCode("STATUS_OK");
-        addStatus.setSeverity("SEVERITY_WARNING");
-        response.getStatus().getAdditionalStatus().add(addStatus);
-
-        response.setDepAcctId(_1Factory.INSTANCE.createDepAcctId_Type());
-        response.getDepAcctId().setBankInfo(_1Factory.INSTANCE.createBankInfo_Type());
-        response.getDepAcctId().getBankInfo().setBranchId("Concord_1");
-        response.getDepAcctId().getBankInfo().setBankId("Dufferin hill");
-        response.getDepAcctId().getBankInfo().setBankIdType("Concord branch");
-        response.getDepAcctId().getBankInfo().setBranchName("A Happy branch");
-        response.getDepAcctId().getBankInfo().setCity("Toronto");
-
-        response.getDepAcctId().getBankInfo().setCountry("Canada");
-        response.getDepAcctId().getBankInfo().setName("Info for A Happy branch");
-        response.getDepAcctId().getBankInfo().setPostalCode("L1LL1L");
-        response.getDepAcctId().getBankInfo().setStateProv("ON");
-
-        List records = response.getDepAcctTrnRec();
-        // Record1
-        DepAcctTrnRec_Type trnRec1 = null;
-        BankAcctTrnRec_Type baTrnRec1 = null;
-        long maxRec = req.getTrnCountLimit().getCount();
-        for (int i = 0; i < maxRec; i++) {
-            trnRec1 = _1Factory.INSTANCE.createDepAcctTrnRec_Type();
-            baTrnRec1 = _1Factory.INSTANCE.createBankAcctTrnRec_Type();
-
-            trnRec1.setBankAcctTrnRec(baTrnRec1);
-            trnRec1.getBankAcctTrnRec().setCSPRefId("CSPRefId1");
-            trnRec1.getBankAcctTrnRec().setPostedDt("1");
-            trnRec1.getBankAcctTrnRec().setOrigDt("1");
-            trnRec1.getBankAcctTrnRec().setBillRefInfo("aaaa");
-
-            trnRec1.getBankAcctTrnRec().setTrnType("1");
-
-            trnRec1.getBankAcctTrnRec().setCurAmt(_1Factory.INSTANCE.createCurrencyAmount());
-            trnRec1.getBankAcctTrnRec().getCurAmt().setAmt(new java.math.BigDecimal(2000.35));
-            trnRec1.getBankAcctTrnRec().getCurAmt().setCurCode("100");
-
-            trnRec1.setStmtRunningBal(_1Factory.INSTANCE.createCurrencyAmount());
-            trnRec1.getStmtRunningBal().setAmt(new java.math.BigDecimal("1345.55"));
-
-            trnRec1.getBankAcctTrnRec().setCustPayeeInfo(_1Factory.INSTANCE.createCustPayeeInfo_Type());
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setBillingAcct("000601832");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setAcctPayAcctId("12");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setName("John Doe");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setNickname("Jody");
-
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setBillerPayee(_1Factory.INSTANCE.createBillerPayee_Type());
-            BillerPayee_Type BillerP = trnRec1.getBankAcctTrnRec().getCustPayeeInfo().getBillerPayee();
-
-            BillerP.setBillerId(_1Factory.INSTANCE.createBillerId_Type());
-            BillerId_Type BId = BillerP.getBillerId();
-
-            BId.setBillerNum("123");
-            BId.setSPName("SomeName");
-
-            trnRec1.setAvailDt("sss");
-            trnRec1.setPmtId("SomeID");
-            trnRec1.setXferId("SomeOtherID");
-
-            records.add(trnRec1);
-        }
-
-        return response;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
deleted file mode 100644
index 3575d94f48..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.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 org.apache.tuscany.sca.itest.trninq;
-
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrninqInterface {
-
-    /**
-     * Auto generated method signatures
-     * @param depAcctTrnInqRq
-     */
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type depAcctTrnInqRq) throws java.rmi.RemoteException;
-
-    //
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac66b6a425..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://trninqcomposite"
-    xmlns:t="http://trninqcomposite">
-    <deployable composite="t:TestService" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/trnInq.composite b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/trnInq.composite
deleted file mode 100644
index 97594216e1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/trnInq.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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://trninqcomposite"

-    name="TestService">

-

-    <service name="TrnInqService" promote="TransactionInquiryComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.trninq.TrninqInterface" />

-        <binding.ws wsdlElement="http://trninq#wsdl.port(TrnInqSvc/TrnInqSvcPort)" />

-    </service>

-    <component name="TransactionInquiryComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.trninq.TrnInqService" />

-    </component>

-

-    <reference name="TrnInqReference" promote="TransactionInquiryClientComponent/transactionInquiryService">

-        <interface.java interface="org.apache.tuscany.sca.itest.trninq.TrninqInterface" />

-        <binding.ws wsdlElement="http://trninq#wsdl.port(TrnInqSvc/TrnInqSvcPort)" />

-    </reference>

-    <component name="TransactionInquiryClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.trninq.TrnInqClient" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
deleted file mode 100644
index b85b80abc4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ /dev/null
@@ -1,146 +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.    
- -->
- <!--
- http://www.ifxforum.org/standards/standard/license
- 
-IFX License Statement
-===================== 
-IFX Forum hereby grants to all users of the IFX Business Message Specification 
-and Data Dictionary (the "Specification") a perpetual, worldwide, royalty-free, 
-nonexclusive, nontransferable license to (a) use the specification in the development 
-of software and/or data compilations which facilitate electronic transmission of 
-information in accordance with the Specification and otherwise implement the 
-Specification in user's products, and (b) market, reproduce, display, and distribute 
-(in any medium known now or in the future) the Specification as implemented in user's 
-products. The foregoing rights may be sublicensed through multiple tiers of distribution, 
-including resellers.
-
-Other than as licensed herein, the IFX Forum shall retain all right, title and interest 
-to any patent, copyrights, trade secrets or other proprietary rights ("Intellectual 
-Property Rights") in the Specification. Subject to all patent rights preserved by IFX Forum 
-members pursuant to Section 5.1 of the "Membership Rules of the Interactive Financial 
-Exchange Forum, Inc.", users shall retain all right, title and interest to the Intellectual 
-Property Rights in any products of user created using the Specification and any modifications, 
-extensions or derivative works of the Specification that user develops or has developed on 
-its behalf as permitted under this Agreement (the "Derivatives"), provided, however, that, 
-users may not hold Derivatives out as being endorsed, sponsored by or affiliated with the 
-IFX Forum. 
- -->
-<xsd:schema xmlns="urn:ifxforum-org:XSD:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="urn:ifxforum-org:XSD:1" elementFormDefault="qualified" attributeFormDefault="unqualified">
-    <xsd:complexType name="AdditionalStatus_Type">
-        <xsd:sequence>
-            <xsd:element name="ServerStatusCode" type="xsd:string" />
-            <xsd:element name="Severity" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BankAcctTrnRec_Type">
-        <xsd:sequence>
-            <xsd:element name="TrnType" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PostedDt" type="xsd:string" />
-            <xsd:element name="OrigDt" type="xsd:string" minOccurs="0" />
-            <xsd:element name="CurAmt" type="CurrencyAmount" />
-            <xsd:element name="BillRefInfo" type="xsd:string" minOccurs="0" />
-            <xsd:element name="CustPayeeInfo" type="CustPayeeInfo_Type" minOccurs="0" />
-            <xsd:element name="CSPRefId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BankInfo_Type">
-        <xsd:sequence>
-            <xsd:element name="BankIdType" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BankId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Name" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BranchId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BranchName" type="xsd:string" minOccurs="0" />
-            <xsd:element name="City" type="xsd:string" minOccurs="0" />
-            <xsd:element name="StateProv" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PostalCode" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Country" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BillerId_Type">
-        <xsd:sequence>
-            <xsd:element name="SPName" type="xsd:string" />
-            <xsd:element name="BillerNum" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BillerPayee_Type">
-        <xsd:sequence>
-            <xsd:element name="BillerId" type="BillerId_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CurrencyAmount">
-        <xsd:sequence>
-            <xsd:element name="Amt" type="xsd:decimal" />
-            <xsd:element name="CurCode" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CustPayeeInfo_Type">
-        <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Nickname" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BillerPayee" type="BillerPayee_Type" />
-            <xsd:element name="BillingAcct" type="xsd:string" minOccurs="0" />
-            <xsd:element name="AcctPayAcctId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnInqRq_Type">
-        <xsd:sequence>
-            <xsd:element name="TrnCountLimit" type="TrnCountLimit_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnInqRs_Type">
-        <xsd:sequence>
-            <xsd:sequence>
-                <xsd:element name="Status" type="Status_Type" />
-                <xsd:element name="DepAcctId" type="DepAcctId_Type" />
-                <xsd:element name="DepAcctTrnRec" type="DepAcctTrnRec_Type" minOccurs="0" maxOccurs="unbounded" />
-            </xsd:sequence>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnRec_Type">
-        <xsd:sequence>
-            <xsd:element name="BankAcctTrnRec" type="BankAcctTrnRec_Type" />
-            <xsd:element name="StmtRunningBal" type="CurrencyAmount" minOccurs="0" />
-            <xsd:element name="AvailDt" type="xsd:string" minOccurs="0" />
-            <xsd:element name="XferId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PmtId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctId_Type">
-        <xsd:sequence>
-            <xsd:element name="BankInfo" type="BankInfo_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="Status_Type">
-        <xsd:sequence>
-            <xsd:element name="StatusCode" type="xsd:int" />
-            <xsd:element name="StatusDesc" type="xsd:string" />
-            <xsd:element name="AdditionalStatus" type="AdditionalStatus_Type" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="TrnCountLimit_Type">
-        <xsd:sequence>
-            <xsd:element name="Count" type="xsd:int" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="DepAcctTrnInqRq" type="DepAcctTrnInqRq_Type" />
-    <xsd:element name="DepAcctTrnInqRs" type="DepAcctTrnInqRs_Type" />
-</xsd:schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
deleted file mode 100644
index 842f7a9d4c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ /dev/null
@@ -1,57 +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.    

--->

-<definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:trninq="urn:ifxforum-org:XSD:1"

-    xmlns:tns="http://trninq" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://trninq">

-    <types>

-        <xsd:schema elementFormDefault="qualified" targetNamespace="http://trninq">

-            <xsd:import namespace="urn:ifxforum-org:XSD:1" schemaLocation="IFX170_XSD.xsd" />

-        </xsd:schema>

-    </types>

-    <message name="DepAcctTrnInqRq">

-        <part name="messagePart" element="trninq:DepAcctTrnInqRq" />

-    </message>

-    <message name="DepAcctTrnInqRs">

-        <part name="messagePart" element="trninq:DepAcctTrnInqRs" />

-    </message>

-    <portType name="trninqInterface">

-        <operation name="DepAcctTrnInq">

-            <input message="tns:DepAcctTrnInqRq" />

-            <output message="tns:DepAcctTrnInqRs" />

-        </operation>

-    </portType>

-    <binding name="trninq" type="tns:trninqInterface">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <operation name="DepAcctTrnInq">

-            <soap:operation soapAction="trninq:DepAcctTrnInq" style="document" />

-            <input>

-                <soap:body use="literal" />

-            </input>

-            <output>

-                <soap:body use="literal" />

-            </output>

-        </operation>

-    </binding>

-    <service name="TrnInqSvc">

-        <port name="TrnInqSvcPort" binding="tns:trninq">

-            <soap:address location="http://localhost:8085/itest-large-sdo-ws/TrnInqService" />

-        </port>

-    </service>

-</definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
deleted file mode 100644
index 17eb575d50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ /dev/null
@@ -1,87 +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 trninq;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.trninq.TrninqInterface;
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.ifxforum.xsd._1.TrnCountLimit_Type;
-import org.ifxforum.xsd._1._1Factory;
-import org.junit.Assert;
-
-/**
- * This test is created to cover https://issues.apache.org/jira/browse/TUSCANY-1541
- * 
- * @version $Rev$ $Date$
- */
-public class TrnInqServiceTestCase extends TestCase {
-
-    private static SCADomain scaDomain;
-    private TrninqInterface trnInq;
-
-    @Override
-    protected void setUp() throws Exception {
-        if (scaDomain == null) {
-            scaDomain = SCADomain.newInstance("trnInq.composite");
-        }
-        trnInq = scaDomain.getService(TrninqInterface.class, "TransactionInquiryClientComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testDepAcctTrnInq() throws IOException {
-        DepAcctTrnInqRq_Type depAcctTrnInqRequest = _1Factory.INSTANCE.createDepAcctTrnInqRq_Type();
-        TrnCountLimit_Type trnCountLimit = _1Factory.INSTANCE.createTrnCountLimit_Type();
-        depAcctTrnInqRequest.setTrnCountLimit(trnCountLimit);
-        depAcctTrnInqRequest.getTrnCountLimit().setCount(2);
-
-        try {
-            DepAcctTrnInqRs_Type depAcctTrnInqResponse = trnInq.DepAcctTrnInq(depAcctTrnInqRequest);
-        } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Assert.fail("Should pass with MaxRec 2! \n" + sw);
-            sw.close();
-            pw.close();
-        }
-
-        depAcctTrnInqRequest.getTrnCountLimit().setCount(10);
-        try {
-            DepAcctTrnInqRs_Type depAcctTrnInqResponse = trnInq.DepAcctTrnInq(depAcctTrnInqRequest);
-        } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Assert.fail("Should pass with MaxRec 10! \n" + sw);
-            sw.close();
-            pw.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/pom.xml b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/pom.xml
deleted file mode 100644
index 72f3f8fc3a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/pom.xml
+++ /dev/null
@@ -1,126 +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.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-late-reference-resolution</artifactId>
-    <name>Apache Tuscany SCA Late Reference Resolution Integration Test</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>                                        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        System.out.println("AddService - add " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
+++ /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.    
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +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 calculator;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService; 
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-       this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-    
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-    
-    public double add(double n1, double n2) {
-        System.out.println("CalculatorService - add " + n1 + " and " + n2);
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        System.out.println("CalculatorService - subtract " + n1 + " and " + n2);
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        System.out.println("CalculatorService - multiply " + n1 + " and " + n2);
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        System.out.println("CalculatorService - divide " + n1 + " and " + n2);
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/DivideService.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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        System.out.println("SubtractService - subtract " + n1 + " and " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index c53b55aacf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ /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 binding extension

-binding.sca.BindingScaEndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.SCABinding

diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index 378d6e9706..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorA">
-
-    <component name="CalculatorServiceComponentA">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponentB" />     
-        <reference name="subtractService" target="SubtractServiceComponentC" />
-        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     
-        <reference name="divideService" target="DivideServiceComponentA" />
-    </component>    
-
-    <component name="MultiplyServiceComponentA">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>   
-    
-    <component name="DivideServiceComponentA">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index db255e0232..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:CalculatorA"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index 3fb16fa619..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorB">
-
-    <component name="AddServiceComponentB">
-        <implementation.java class="calculator.AddServiceImpl" />
-        <service name="AddService">
-            <binding.sca uri="http://localhost:8085/AddServiceComponentB"/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 130157ac04..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:CalculatorB"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index c615b4355a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorC">
-
-    <component name="SubtractServiceComponentC">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-        <service name="SubtractService">
-            <binding.sca uri="http://localhost:8086/SubtractServiceComponentC"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index cba0a5c281..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:CalculatorC"/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
deleted file mode 100644
index e4bd3035e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
+++ /dev/null
@@ -1,50 +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 binding.sca;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-
-/**
- * The factory for creating endpoint Binding providers
- * 
- * @version $Rev$ $Date$
- */
-public class BindingScaEndpointResolverFactoryImpl implements EndpointResolverFactory<SCABinding> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public BindingScaEndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;     
-    } 
-    
-    public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) {
-              
-        return  new BindingScaEndpointResolverImpl(extensionPoints, endpoint, binding);
-    }
-
-    public Class<SCABinding> getModelType() {
-        return SCABinding.class;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
deleted file mode 100644
index c6e0689837..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
+++ /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.    
- */
-
-package binding.sca;
-
-
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-
-import calculator.LateReferenceResolutionTestCase;
-
-/** 
- * The endpoint resolver allows unresolved endpoints to be plumbed into
- * the runtime start and message send processing as a hook to late resolution
- * of target services
- * 
- * @version $Rev$ $Date$
- */
-public class BindingScaEndpointResolverImpl implements EndpointResolver {
-
-    private final static Logger logger = Logger.getLogger(BindingScaEndpointResolverImpl.class.getName());
-
-    private Endpoint endpoint;
-    private SCABinding binding;
-
-    public BindingScaEndpointResolverImpl(ExtensionPointRegistry extensionPoints,
-                                          Endpoint endpoint, 
-                                          Binding binding) {
-        this.endpoint = endpoint;
-        this.binding = (SCABinding)binding;
-    }
-
-    public void start(){
-        // do nothing
-    } 
-    
-    public void resolve() {
-        if (endpoint.isUnresolved()){
-            // I can cheat here because I know this test only has 
-            // SCA Bindings in it so all I have to do it find the URL 
-            // of the endpoint
-            String targetURL = LateReferenceResolutionTestCase.registry.locateService(endpoint.getTargetName());
-            binding.setURI(targetURL);
-            endpoint.setSourceBinding(binding);
-        }
-    }
-    
-    public void stop(){
-        // do nothing
-    }    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
deleted file mode 100644
index d3fe027e60..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ /dev/null
@@ -1,97 +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 calculator;
-
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class LateReferenceResolutionTestCase {
-
-    private static SCANode2 nodeA;
-    private static SCANode2 nodeB;
-    private static SCANode2 nodeC;
-
-    private static CalculatorService calculatorService;
-    
-    public static TestRegistryImpl registry = new TestRegistryImpl();
-    
-    @BeforeClass
-    public static void init() throws Exception {
-             
-        try {
-            System.out.println("Setting up domain");
-
-            
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeC", 
-                                    new File("src/main/resources/nodeC").toURL().toString()));
-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeB", 
-                                    new File("src/main/resources/nodeB").toURL().toString()));
-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeA", 
-                                    new File("src/main/resources/nodeA").toURL().toString()));
-
-            nodeC.start();
-            nodeB.start();
-            nodeA.start();
-            
-            SCAClient client = (SCAClient)nodeA;
-            calculatorService = 
-                client.getService(CalculatorService.class, "CalculatorServiceComponentA");
-
-        } catch(Exception ex){
-            System.err.println(ex.toString());
-        }  
-        
-   }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeC.stop();
-        nodeB.stop();
-        nodeA.stop();
-    }    
-
-    @Test
-    public void testCalculator() throws Exception {       
-        
-        // Calculate
-        Assert.assertEquals(calculatorService.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorService.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorService.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorService.divide(3, 2), 1.5);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
deleted file mode 100644
index 57afc9ea50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
+++ /dev/null
@@ -1,40 +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 calculator;
-
-/**
- * A dummy domain registry component
- */
-public class TestRegistryImpl {
-
-    public String locateService(String targetServiceName){
-        String targetURL = null;
-        
-        // In reality of course a registry would have to be initialized
-        // with the real target service endpoints but in this test
-        // we know what they are going to be ahead of time
-        if (targetServiceName.equals("AddServiceComponentB")){
-            targetURL = "http://localhost:8085/" + targetServiceName;
-        } else if (targetServiceName.equals("SubtractServiceComponentC")){
-            targetURL = "http://localhost:8086/" + targetServiceName;
-        }
-        
-        return targetURL;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/build.xml b/tags/java/sca/1.3-RC1a/itest/oneway/build.xml
deleted file mode 100644
index 3e68be8661..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/build.xml
+++ /dev/null
@@ -1,127 +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="oneway" default="runServer">

-

-	<property name="m2.repo"   value="${user.home}\.m2\repository" />

-	

-    <path id="repo.classpath">   	

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

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.3\tuscany-core-spi-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.3\tuscany-host-http-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.3\tuscany-binding-ws-axis2-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.3\tuscany-policy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>

-    	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.3\tuscany-implementation-java-runtime-1.3.jar"/>

-    	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>

-    	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>

-    	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.3\tuscany-contribution-namespace-1.3.jar"/>

-    	<pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.3\tuscany-assembly-xsd-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.3\tuscany-assembly-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.3\tuscany-core-databinding-1.3.jar"/>

-    	<pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.3\tuscany-policy-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.3\tuscany-sca-api-1.3.jar"/>

-    	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>

-    	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.3\tuscany-contribution-java-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.3\tuscany-databinding-1.3.jar"/>

-    	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.3\tuscany-binding-ws-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>

-    	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>

-    	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.3\tuscany-policy-security-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.3\tuscany-assembly-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.3\tuscany-domain-1.3.jar"/>

-    	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.3\tuscany-interface-java-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.3\tuscany-contribution-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.3\tuscany-implementation-java-1.3.jar"/>

-    	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>

-    	<pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.3\tuscany-domain-api-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.3\tuscany-binding-sca-1.3.jar"/>

-    	<pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\1.3\tuscany-host-jetty-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.3\tuscany-implementation-java-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.3\tuscany-binding-sca-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.3\tuscany-interface-wsdl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.3\tuscany-binding-ws-1.3.jar"/>

-    	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.3\tuscany-databinding-axiom-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>

-    	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.3\tuscany-core-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.3\tuscany-interface-wsdl-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.3\tuscany-contribution-impl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.3\tuscany-node-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.3\tuscany-definitions-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>

-    	<pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/>

-    	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.3\tuscany-host-embedded-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>

-    	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>

-    	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.3\tuscany-interface-java-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>

-    	<pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.3\tuscany-interface-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/>  	

-   </path>	

-    	

-    <target name="runServer">

-        <java classname="org.apache.tuscany.sca.itest.oneway.impl.OneWayServer"

-              fork="true">

-            <classpath>

-            	<path refid="repo.classpath"/>

-            </classpath>    	        	

-        </java>

-    </target>

-	

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/pom.xml b/tags/java/sca/1.3-RC1a/itest/oneway/pom.xml
deleted file mode 100644
index 25dc3bf9f4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-oneway</artifactId>

-    <name>Apache Tuscany SCA OneWay Integration Tests</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

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

-            <version>1.3</version>

-        </dependency>        

-        

-        <dependency>

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

-            <artifactId>tuscany-node2-impl</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-                

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
deleted file mode 100644
index 04c6069dfe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ /dev/null
@@ -1,40 +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.itest.oneway;

-

-/**

- * The client for the oneway itest.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-public interface OneWayClient { 

-

-    /**

-     * This method will invoke the doSomething() @OneWay method on the OneWayService

-     * the specified number of times.

-     * 

-     * @param count The number of times to invoke doSomething() on the OneWayService

-     */

-    void doSomething(int count);

-

-    /**

-     * This method will invoke a @OneWay method that throws an exception.

-     */

-    void doSomethingWhichThrowsException();

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
deleted file mode 100644
index b3cec51b1f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ /dev/null
@@ -1,47 +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.itest.oneway;

-

-

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

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

-

-

-/**

- * The service interface used when testing @OneWay interactions.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-public interface OneWayService {

-

-    /**

-     * This OneWay method will increment the callCount by 1.

-     * 

-     * @param count Not used

-     */

-    @OneWay

-    void doSomething(int count);

-

-    /**

-     * This one way method will throw a NullPointerException.

-     */

-    @OneWay

-    void doSomethingWhichThrowsException();

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
deleted file mode 100644
index 8013c5c0e8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ /dev/null
@@ -1,64 +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.itest.oneway.impl;

-

-import org.apache.tuscany.sca.itest.oneway.OneWayClient;

-import org.apache.tuscany.sca.itest.oneway.OneWayService;

-import org.junit.Assert;

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

-

-

-/**

- * The client for the oneway itest.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-public class OneWayClientImpl implements OneWayClient {

-    /**

-     * Injected reference to the OneWayService.

-     */

-    @Reference 

-    protected OneWayService oneWayService;

-

-    /**

-     * Tracks the number of calls of the doSomething() method on the OneWayService.

-     */

-    public static int callCount = 0;

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomething(int count) {

-        callCount = callCount + count;

-

-        for (int loopCount = 0; loopCount < count; loopCount++) {

-            //System.out.println("Client: doSomething " + loopCount);

-            //System.out.flush();

-            oneWayService.doSomething(loopCount);

-        }

-    }

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomethingWhichThrowsException() {

-        Assert.assertNotNull(oneWayService);

-        oneWayService.doSomethingWhichThrowsException();

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
deleted file mode 100644
index 01f956cb67..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ /dev/null
@@ -1,68 +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.itest.oneway.impl;

-

-import org.apache.tuscany.sca.itest.oneway.OneWayService;

-

-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;

-

-/**

- * The service for the oneway itest.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-

-public class OneWayServiceImpl implements OneWayService {

-

-    /**

-     * This is the error message that will be in the Exception thrown by

-     * the doSomethingWhichThrowsException() method.

-     */

-    public static final String EXCEPTION_MESSAGE = "Sample RuntimeException from a @OneWay method";

-

-    /**

-     * Counts the number of invocations to doSomething().

-     */

-    public static final AtomicInteger CALL_COUNT = new AtomicInteger();

-

-    /**

-     * Counts the number of invocations of the doSomethingWhichThrowsException() method.

-     */

-    public static final AtomicInteger CALL_COUNT_FOR_THROWS_EXCEPTION_METHOD = new AtomicInteger();

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomething(int count) {

-        CALL_COUNT.incrementAndGet();

-

-       // System.out.println("Service: doSomething " + count + " callCount = " + callCount);

-       // System.out.flush();

-    }

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomethingWhichThrowsException() {

-        System.out.println("OneWay invoked. About to throw an Exception");

-        CALL_COUNT_FOR_THROWS_EXCEPTION_METHOD.incrementAndGet();

-        throw new NullPointerException(EXCEPTION_MESSAGE);

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/tags/java/sca/1.3-RC1a/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
deleted file mode 100644
index d053a6278c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ /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.

--->

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

-           targetNamespace="http://oneway"

-	       name="OneWayITest">

- 	      

-    <component name="OneWayClientComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>

-		<reference name="oneWayService" target="OneWayServiceComponent">

-		    <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />       

-            <binding.ws/>

-        </reference>

-	</component> 

-          

-    <component name="OneWayServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" /> 

-            <binding.ws uri="http://localhost:8085/OneWayServiceComponent"/>

-        </service>

-    </component> 	        

-

-

-    <!-- OneWay Client and Server Components that use the standard SCA Binding so we can validate -->

-    <!-- that the NonBlockingInterceptor logs an message when an Exception is thrown by the code -->

-    <!-- that is called. See TUSCANY-2225 --> 

-    <component name="OneWayClientComponentSCABinding">

-        <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>

-        <reference name="oneWayService" target="OneWayServiceComponentSCABinding">

-            <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />

-        </reference>

-    </component> 

-

-    <component name="OneWayServiceComponentSCABinding">

-        <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" /> 

-        </service>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/tags/java/sca/1.3-RC1a/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
deleted file mode 100644
index b21042c06b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ /dev/null
@@ -1,233 +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.itest.oneway;

-

-import java.util.concurrent.atomic.AtomicBoolean;

-import java.util.logging.Handler;

-import java.util.logging.Level;

-import java.util.logging.LogRecord;

-import java.util.logging.Logger;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;

-import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;

-import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;

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

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

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

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * This test case will test invoking @OneWay operations.

- *

- * @version $Date$ $Revision$

- */

-public class OneWayTestCase {

-    /**

-     * Maximum period of time that we are prepared to wait for all the @OneWay

-     * method calls to complete in milliseconds.

-     */

-    private static final int MAX_SLEEP_TIME = 10000;

-

-    private SCANode2 node;

-    

-    /**

-     * Initialise the SCADomain.

-     *

-     * @throws Exception Failed to initialise the SCADomain

-     */

-    @Before

-    public void setUp() throws Exception {

-        

-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-        node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);

-        node.start();

-        

-    }

-

-    /**

-     * This method will ensure that the SCADomain is shutdown.

-     *

-     * @throws Exception Failed to shutdown the SCADomain

-     */

-    @After

-    public void tearDown() throws Exception {

-        node.stop();

-    }

-

-    /**

-     * This test will test repeatedly calling a @OneWay operation and ensure that the correct

-     * number of @OneWay operations  are run.

-     * 

-     * @throws Exception Test failed

-     */

-    @Test

-    public void testOneWay() throws Exception {

-        OneWayClient client =

-            ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponent");

-

-        int count = 100;

-

-        for (int i = 0; i < 10; i++) {

-           // System.out.println("Test: doSomething " + count);

-           // System.out.flush();

-            client.doSomething(count);

-

-            // TUSCANY-2192 - We need to sleep to allow the @OneWay method calls to complete.

-            // Note: This can take different periods depending on the speed and load

-            // on the computer where the test is being run.

-            // This loop will wait for the required number of @OneWay method calls to

-            // have taken place or MAX_SLEEP_TIME to have passed.

-            long startSleep = System.currentTimeMillis();

-            while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get() 

-                    && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) {

-                Thread.sleep(100);

-                // System.out.println("" + OneWayClientImpl.callCount + "," + OneWayServiceImpl.callCount);

-            }

-

-            System.out.println("Finished callCount = " + OneWayServiceImpl.CALL_COUNT);

-

-            Assert.assertEquals(OneWayClientImpl.callCount, OneWayServiceImpl.CALL_COUNT.get());

-        }

-    }

-

-    /**

-     * This method will invoke a @OneWay method that throws an exception

-     * when invoked over a SCA Binding which uses the NonBlockingInterceptor and

-     * ensure that the Exception is logged.

-     * See TUSCANY-2225

-     */

-    @Test

-    public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {

-        OneWayClient client =

-            ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");

-            

-        // We need to modify the JDK Logger for the NonBlockingInterceptor so we

-        // can check that it logs a message for the @OneWay invocation that throws

-        // an Exception

-        Logger nbiLogger = Logger.getLogger(NonBlockingInterceptor.class.getName());

-        DummyJDKHandler handler = new DummyJDKHandler();

-        nbiLogger.addHandler(handler);

-

-        // Add a message on the console to explain the stack dump that is going to be

-        // displayed and state that this is not a problem but expected behaviour

-        System.out.println();

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println("IMPORTANT: The error message that appears on the console");

-        System.out.println("below is an expected error if it is a NullPointerException");

-        System.out.println(" with the message of:");

-        System.out.println("  \"" + OneWayServiceImpl.EXCEPTION_MESSAGE + "\"");

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println();

-        System.out.flush();

-

-        // Invoke the @OneWay method that throws an exception

-        client.doSomethingWhichThrowsException();

-

-        // The logging is done asynchronously so we will need to wait a bit before

-        // the log message appears.

-        long start = System.currentTimeMillis();

-        boolean logged = false;

-        while (System.currentTimeMillis() - start < MAX_SLEEP_TIME && !logged) {

-            // Has the log message been logged?

-            if (handler.exceptionLogged.get()) {

-                logged = true;

-            } else {

-                try {

-                    Thread.sleep(25);

-                } catch (InterruptedException ex) {

-                    Assert.fail("Unexpected exception " + ex);

-                }

-            }

-        }

-

-        // Add a message explaining that errors beyond this point should be reported 

-        System.out.println();

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println("End of expected exceptions. Any errors beyond this point are errors!");

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println();

-        System.out.flush();

-

-        // Remove the handler

-        nbiLogger.removeHandler(handler);

-

-        // Make sure that the exception was logged

-        Assert.assertTrue(handler.exceptionLogged.get());

-    }

-

-    /**

-     * A handler that is added to the JDK Logging system to examine the log messages

-     * generated to ensure that a @OneWay method that throws an Exception will 

-     * generate a log message.

-     */

-    private class DummyJDKHandler extends Handler {

-

-        /**

-         * Used to track whether the exception has been logged.

-         */

-        private AtomicBoolean exceptionLogged = new AtomicBoolean(false);

-

-        /**

-         * Constructor.

-         */

-        private DummyJDKHandler() {

-            super.setLevel(Level.ALL);

-        }

-

-        /**

-         * {@inheritDoc}

-         */

-        @Override

-        public void close() throws SecurityException {

-            // Nothing to do

-        }

-

-        /**

-         * {@inheritDoc}

-         */

-        @Override

-        public void flush() {

-            // Nothing to do

-        }

-

-        /**

-         * Examines the LogRecord and checks whether it matches the one we are looking for.

-         * If it matches, it will set exceptionLogged to True.

-         * 

-         * @param record The Log Record that is being published

-         */

-        @Override

-        public void publish(LogRecord record) {

-            // The log message we are looking for is Severe

-            if (record.getLevel() == Level.SEVERE) {

-                if (record.getThrown() != null

-                        && record.getThrown().toString().indexOf(

-                                OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) {

-                    // We have found our Exception.

-                    exceptionLogged.set(true);

-                }

-            }

-        }

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/operation-overloading/pom.xml b/tags/java/sca/1.3-RC1a/itest/operation-overloading/pom.xml
deleted file mode 100644
index 79fe5fb294..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/operation-overloading/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-operation-overloading</artifactId>
-    <name>Apache Tuscany SCA Operation Overloading Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
deleted file mode 100644
index 85b5717c00..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ /dev/null
@@ -1,61 +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.test.opoverload;
-
-/**
- * This is an Interface which has methods declared but not implemented, These methods will be implemented in
- * OverloadATarget Class and OverloadASource This class has methods with overloaded parameters.
- */
-
-//@AllowsPassByReference
-public interface OverloadASourceTarget {
-    final String opName = "operationA:";
-
-    /**
-     * Method with no parameters
-     */
-    String operationA();
-
-    /**
-     * Method with one integer parameter
-     */
-    String operationA(int parm1);
-
-    /**
-     * Method with one integer parameter and one string parameter
-     */
-    String operationA(int parm1, String parm2);
-
-    /**
-     * Method with one one string parameter and one integer parameter
-     */
-    String operationA(String parm1, int parm2);
-
-    /**
-     * Method with one string parameter
-     */
-    String operationA(String string);
-
-    /**
-     * Method which throws an illegal argument exception in case of any exceptions.
-     */
-    String[] operationAall();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
deleted file mode 100644
index e5d5083a2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ /dev/null
@@ -1,113 +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.test.opoverload.impl;
-
-import java.util.ArrayList;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are
- * declared in the OverloadASourceTarget interface.
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadASource implements OverloadASourceTarget {
-    public OverloadASourceTarget overloadASourceTarget;
-
-    /**
-     * This is a default constructor
-     */
-    public OverloadASource() {
-
-    }
-
-    /**
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String[] operationAall() {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        ArrayList<String> ret = new ArrayList<String>();
-        ret.add(overloadASourceTarget.operationA());
-        ret.add(overloadASourceTarget.operationA(11));
-        ret.add(overloadASourceTarget.operationA("eleven"));
-        ret.add(overloadASourceTarget.operationA(3, "three"));
-        ret.add(overloadASourceTarget.operationA("four", 4));
-        return (String[])ret.toArray(new String[ret.size()]);
-    }
-
-    /**
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String operationA() {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA();
-    }
-
-    /**
-     * @param parm1
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
-     */
-    public String operationA(int parm1) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1);
-    }
-
-    /**
-     * @param parm1
-     * @param parm2
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String)
-     */
-    public String operationA(int parm1, String parm2) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1, parm2);
-    }
-
-    public String operationA(String string) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(string);
-    }
-
-    /**
-     * @param parm1
-     * @param parm2
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(java.lang.String, int)
-     */
-    public String operationA(String parm1, int parm2) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1, parm2);
-    }
-
-    /**
-     * This method which is used by all the overloaded functions to set the source target
-     */
-    @Reference
-    public void setOverloadASourceTarget(OverloadASourceTarget overloadASourceTarget) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is set tonull";
-        this.overloadASourceTarget = overloadASourceTarget;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
deleted file mode 100644
index e206a86768..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ /dev/null
@@ -1,99 +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.test.opoverload.impl;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are
- * declared in the OverloadASourceTarget interface.
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadATarget implements OverloadASourceTarget {
-
-    /**
-     * This is a default Constructor
-     */
-    public OverloadATarget() {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
-     */
-    public String operationA(int parm1) {
-        final String ret = opName + parm1;
-        out(ret);
-        return ret;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String)
-     */
-    public String operationA(int parm1, String parm2) {
-        final String ret = opName + parm1 + parm2;
-        out(ret);
-        return ret;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String operationA() {
-        out(opName);
-        return opName;
-
-    }
-
-    public String operationA(String parm1, int parm2) {
-        final String ret = opName + parm1 + parm2;
-        out(ret);
-        return ret;
-    }
-
-    public String operationA(String parm1) {
-        final String ret = opName + parm1;
-        out(ret);
-        return ret;
-    }
-
-    /**
-     * This method is used to print the message returned by all the overloaded functions
-     */
-    private void out(String msg) {
-
-        java.lang.System.out.println(msg);
-    }
-
-    public String[] operationAall() {
-        throw new IllegalArgumentException("not supported");
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/resources/OperationOverload.composite b/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/resources/OperationOverload.composite
deleted file mode 100644
index cbf5aa2078..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/main/resources/OperationOverload.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://foo"
-	xmlns:foo="http://foo" 
-	name="OperationOverload">
-   
-    <component name="OverloadASourceComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadASource" />
-        <reference name="overloadASourceTarget" target="OverloadATargetComponent"/>
-    </component>
-
-    <component name="OverloadATargetComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadATarget" />
-    </component>
-     
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
deleted file mode 100644
index 0b3b12c762..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ /dev/null
@@ -1,84 +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.test.opoverload.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-
-public class OverloadATestCase extends TestCase {
-
-    private SCADomain domain;
-    private OverloadASourceTarget overloadA;
-
-    /**
-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
-     * test verifies the values compared are same as the values retrieved from the SCA runtime.
-     */
-    public void testOperationAall() {
-        String[] result = overloadA.operationAall();
-        assertEquals(5, result.length);
-        assertEquals(OverloadASourceTarget.opName, result[0]);
-        assertEquals(OverloadASourceTarget.opName + 11, result[1]);
-        assertEquals(OverloadASourceTarget.opName + "eleven", result[2]);
-        assertEquals(OverloadASourceTarget.opName + 3 + "three", result[3]);
-        assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]);
-    }
-
-    public void testOperationAInt() {
-        String result = overloadA.operationA(29);
-        assertEquals(OverloadASourceTarget.opName + 29, result);
-    }
-
-    public void testOperationAString() {
-        String result = overloadA.operationA("rick:-)");
-        assertEquals(OverloadASourceTarget.opName + "rick:-)", result);
-    }
-
-    public void testOperationAIntString() {
-        String result = overloadA.operationA(123, "Tuscany");
-        assertEquals(OverloadASourceTarget.opName + 123 + "Tuscany", result);
-    }
-
-    public void testOperationStringInt() {
-        String result = overloadA.operationA("StringInt", 77);
-        assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result);
-    }
-
-    /**
-     * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending
-     * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and
-     * to get a reference to the contribution service
-     */
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("OperationOverload.composite");
-        overloadA = domain.getService(OverloadASourceTarget.class, "OverloadASourceComponent");
-    }
-
-    /**
-     * tearDown() is a method in JUnit Frame Work which is executed after all other methods in the class extending
-     * unit.framework.TestCase. So this method is used to close the SCA domain.
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
deleted file mode 100644
index 82d536cbfe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ /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.
--->
-<project name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
-
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-
-        <delete file="target/classes/META-INF/sca-contribution.xml"/>
-    </target>
-
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/pom.xml
deleted file mode 100644
index 49f837d3b2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ /dev/null
@@ -1,211 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-contribution-classes</artifactId>
-    <name>Apache Tuscany OSGi Contribution Version 1 classes</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <finalName>itest-osgi-contribution-classes-v2</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-bundles</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               CustomerV2.componentType \
-                                               RetailerV2.componentType \
-                                               WarehouseV2.componentType \
-                                               ShipperV2.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer2V2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer2.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               Customer2V2.componentType \
-                                               RetailerV2.componentType \
-                                               WarehouseV2.componentType \
-                                               ShipperV2.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerJarV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/RetailerJar.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="ShipperV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
-                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="WarehouseV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
-                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChainV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/SupplyChain.mf" />
-                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/** \
-                                               supplychain.composite \
-                                               CustomerV2.componentType \
-                                               RetailerV2.componentType \
-                                               WarehouseV2.componentType \
-                                               ShipperV2.componentType \
-                                               CustomerV2.jar \
-                                               RetailerV2.jar \
-                                               WarehouseV2.jar \
-                                               ShipperV2.jar \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,121 +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 supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which don't use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    String serviceName;
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    
-    Class myClass;
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl(String serviceName, String... references) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.serviceName = serviceName;
-        this.references = references;
-        
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OSGi bundle with activator " + name);
-    	
-    	this.bundleContext = bc;
-    	
-        bundleContext.registerService(serviceName, this, new Hashtable());
-        
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                
-    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
-	            if (ref != null) {
-                    Object obj = bundleContext.getService(ref);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop OSGi bundle with activator " + name);
-
-    }
-    
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,33 +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 supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 2b8c973e2c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,55 +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 supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /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.    
- */
-package supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    
-   
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	this.retailer = null;
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public OSGiCustomerImpl() {
-        super("supplychain.customer.Customer", "retailer");
-                
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index cc5d44d279..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-       
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-       
-    }
-
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ /dev/null
@@ -1,44 +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 supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super("supplychain.retailer.Retailer", "warehouse");
-    }
-    
-    public void submitOrder(String order) {
-        warehouse.fulfillOrder(order + ", submitted");        
-        
-    }
-
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 2d1bb68e5b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,52 +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 supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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 supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,42 +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 supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
-    private Customer customer;
-    
-    public OSGiShipperImpl() {
-    	super("supplychain.shipper.Shipper", "customer");
-    }
-    
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index c39a34cb96..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /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.    
- */
-package supplychain.warehouse;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-   
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ /dev/null
@@ -1,44 +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 supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public OSGiWarehouseImpl() {
-    	super("supplychain.warehouse.Warehouse", "shipper");
-    }
-    
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 4779eff514..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   
-   <import namespace="RetailerV2" location="RetailerV2" />
-   <import namespace="ShipperV2" location="ShipperV2" />
-   <import namespace="WarehouseV2" location="WarehouseV2" />
-   <export namespace="CustomerV2" />
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d505834f15..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="RetailerV2" />
-   
-   
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 6bcf6cef0a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="ShipperV2" />
-   
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index e23e1a2ecd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,28 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="WarehouseV2" />
-   
-   
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.retailer.Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.shipper.Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.warehouse.Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 644b207e70..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer;version="[2.0.0,3.0.0)",

-                supplychain.shipper;version="[2.0.0,3.0.0)",

-                supplychain.warehouse;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index e649870356..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,               

-                supplychain.retailer,

-                supplychain.shipper,

-                supplychain.warehouse

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index 8e8e33ecd1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.retailer;version="2.0.0"

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 5f4a8b94ec..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index 57d2ac9e4d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChain

-Bundle-SymbolicName: supplychain.SupplyChain

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: supplychain.customer;version="2.0.0",

-    supplychain.retailer;version="2.0.0",

-    supplychain.warehouse;version="2.0.0",

-    supplychain.shipper;version="2.0.0"

-Bundle-ClassPath: .,CustomerV2.jar,RetailerV2.jar,WarehouseV2.jar,ShipperV2.jar

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 2e1399bb3b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.shipper;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
deleted file mode 100644
index bb8fb2b07c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ /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.    

--->

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

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

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponentV2">

-        <tuscany:implementation.osgi 

-            bundle="Customer" 

-            bundleSymbolicName="supplychain.customer.Customer"

-            bundleVersion="2.0.0"

-        />

-            

-        <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" /-->

-        <reference name="retailer" target="RetailerComponentV2" />

-    </component>

-

-    <component name="RetailerComponentV2">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <!--implementation.osgi

-            bundle="Retailer" 

-            bundleLocation="file:target/Retailer.jar" 

-        /-->

-        <reference name="warehouse" target="WarehouseComponentV2"/>

-    </component>

-

-    <component name="WarehouseComponentV2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <!--implementation.osgi

-            bundle="Warehouse" 

-            bundleLocation="file:target/Warehouse.jar" 

-        /-->

-        <reference name="shipper" target="ShipperComponentV2" />

-    </component>

-

-    <component name="ShipperComponentV2">

-        <tuscany:implementation.osgi

-            bundle="Shipper"

-            bundleSymbolicName="supplychain.shipper.Shipper"

-            bundleVersion="2.0.0"

-        />

-        <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->

-        <reference name="customer" target="CustomerComponentV2" />

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/build-bundles.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/build-bundles.xml
deleted file mode 100644
index 82d536cbfe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ /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.
--->
-<project name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
-
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-
-        <delete file="target/classes/META-INF/sca-contribution.xml"/>
-    </target>
-
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/pom.xml
deleted file mode 100644
index af1c258f25..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/pom.xml
+++ /dev/null
@@ -1,212 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-contribution-classes-v2</artifactId>
-    <name>Apache Tuscany OSGi Contribution Version 2 classes</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>itest-osgi-contribution-classes</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-bundles</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               CustomerV1.componentType \
-                                               RetailerV1.componentType \
-                                               WarehouseV1.componentType \
-                                               ShipperV1.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer2V1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer2.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               Customer2V1.componentType \
-                                               RetailerV1.componentType \
-                                               WarehouseV1.componentType \
-                                               ShipperV1.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerJarV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/RetailerJar.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="ShipperV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
-                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="WarehouseV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
-                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChainV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/SupplyChain.mf" />
-                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/** \
-                                               supplychain.composite \
-                                               CustomerV1.componentType \
-                                               RetailerV1.componentType \
-                                               WarehouseV1.componentType \
-                                               ShipperV1.componentType \
-                                               CustomerV1.jar \
-                                               RetailerV1.jar \
-                                               WarehouseV1.jar \
-                                               ShipperV1.jar \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,121 +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 supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which don't use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    String serviceName;
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    
-    Class myClass;
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl(String serviceName, String... references) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.serviceName = serviceName;
-        this.references = references;
-        
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OSGi bundle with activator " + name);
-    	
-    	this.bundleContext = bc;
-    	
-        bundleContext.registerService(serviceName, this, new Hashtable());
-        
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                
-    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
-	            if (ref != null) {
-                    Object obj = bundleContext.getService(ref);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop OSGi bundle with activator " + name);
-
-    }
-    
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,33 +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 supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index d0b0a13e6d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,55 +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 supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /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.    
- */
-package supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    
-   
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	this.retailer = null;
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public OSGiCustomerImpl() {
-        super("supplychain.customer.Customer", "retailer");
-                
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index d2bf71ed28..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-       
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-       
-    }
-
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ /dev/null
@@ -1,44 +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 supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super("supplychain.retailer.Retailer", "warehouse");
-    }
-    
-    public void submitOrder(String order) {
-        warehouse.fulfillOrder(order + ", submitted");        
-        
-    }
-
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 2556a0cfa0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,52 +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 supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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 supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,42 +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 supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
-    private Customer customer;
-    
-    public OSGiShipperImpl() {
-    	super("supplychain.shipper.Shipper", "customer");
-    }
-    
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index e180c37e3f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /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.    
- */
-package supplychain.warehouse;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-   
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ /dev/null
@@ -1,44 +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 supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public OSGiWarehouseImpl() {
-    	super("supplychain.warehouse.Warehouse", "shipper");
-    }
-    
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 828dc6f472..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   <import namespace="RetailerV1" location="RetailerV1" />
-   <import namespace="ShipperV1" location="ShipperV1" />
-   <import namespace="WarehouseV1" location="WarehouseV1" />
-   <export namespace="CustomerV1" />
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index 9293b1ff52..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <export namespace="RetailerV1" />
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 03077aa4d4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-   <export namespace="ShipperV1" />
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index c96deb4e1b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-   <export namespace="WarehouseV1" />
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.retailer.Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.shipper.Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="supplychain.warehouse.Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 404995a90f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer;version="[1.0.0,2.0.0)",

-                supplychain.warehouse;version="[1.0.0,2.0.0)",

-                supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index 0441e8c6f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer,

-                supplychain.shipper,

-                supplychain.warehouse

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index ac0ca72030..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.retailer;version="1.0.0"

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 61f62fa16e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index dc4aa2c30e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChain

-Bundle-SymbolicName: supplychain.SupplyChain

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: supplychain.customer;version="1.0.0",

-    supplychain.retailer;version="1.0.0",

-    supplychain.warehouse;version="1.0.0",

-    supplychain.shipper;version="1.0.0"

-Bundle-ClassPath: .,CustomerV1.jar,RetailerV1.jar,WarehouseV1.jar,ShipperV1.jar

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index d149165366..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
deleted file mode 100644
index 4a18aed5f3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,66 +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://www.osoa.org/xmlns/sca/1.0"

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

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <!--tuscany:implementation.osgi 

-            bundle="Customer" 

-            bundleLocation="file:target/Customer.jar" 

-            scope="COMPOSITE"

-        /-->

-            

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <!--implementation.osgi

-            bundle="Retailer" 

-            bundleLocation="file:target/Retailer.jar" 

-        /-->

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <!--implementation.osgi

-            bundle="Warehouse" 

-            bundleLocation="file:target/Warehouse.jar" 

-        /-->

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <!--tuscany:implementation.osgi

-            bundle="Shipper" 

-            bundleLocation="file:target/Shipper.jar" 

-        /-->

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/pom.xml
deleted file mode 100644
index 58cf2886f4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/pom.xml
+++ /dev/null
@@ -1,92 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-contribution-test</artifactId>
-    <name>Apache Tuscany OSGi Contribution tests</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
deleted file mode 100644
index 108481fcbd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ /dev/null
@@ -1,73 +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.contribution.osgi;
-
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * OSGi Test Utils
- */
-public  class OSGiTestUtil  {
-    
-    public static BundleContext setUpOSGiTestRuntime() throws Exception {
-
-        setUpFelixTestRuntime();
-        return OSGiRuntime.getRuntime().getBundleContext();
-    }
-    
-    
-    public static void setUpFelixTestRuntime() throws Exception {
-
-        String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
-        
-        System.setProperty("felix.config.properties", felixConfigFileName);
-        
-        try {
-            
-            ClassLoader cl = OSGiTestUtil.class.getClassLoader();
-            
-            Class felixMainClass = cl.loadClass("org.apache.felix.main.Main");
-            if (felixMainClass != null) {
-                String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();
-                int index = 0;
-                if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {
-                    felixDir = felixDir.substring(0, index);
-                    System.setProperty("FELIX_DIR", felixDir);
-                }
-            }
-            
-        } catch (Exception e) {
-            // Ignore
-        }
-        
-        
-    }
-    
-    public static void shutdownOSGiRuntime()  {
-        try {
-            OSGiRuntime.stop();
-        
-        } catch (Exception e) {
-            // Ignore
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
deleted file mode 100644
index 28fe368663..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ /dev/null
@@ -1,43 +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.contribution.osgi.test;
-
-
-/*
- * 
- * Supplychain using OSGi and non-OSGi contributions
- * 
- * 
- */
-
-public class MixedContributionTestCase extends SCAResolverTestCase {
-
-    @Override
-    protected void setUp() throws Exception {
-        
-
-        customerJarName = "Customer2";
-        retailerJarName = "RetailerJar";
-    
-        setUpOSGi();
-        setUpSCA();
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
deleted file mode 100644
index be3b7365e5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ /dev/null
@@ -1,182 +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.contribution.osgi.test;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-/*
- * 
- * Supplychain using OSGi contributions, with nested jar files and bundles used
- * by <implementation.java/> and <implementation.osgi/>
- * 
- * SupplyChain v1 is a bundle containing jar files which are used by <implementation.java/>
- * SupplyChain v2 is a bundle containing bundles which are used by <implementation.osgi/>
- */
-
-public class NestedBundleTestCase extends TestCase {
-
-
-    protected  EmbeddedSCADomain domain;
-    
-    private SupplyChain supplyChainV1;
-    private SupplyChain supplyChainV2;
-    
-    @Override
-    protected void setUp() throws Exception {
-    
-        setUpOSGi();
-        setUpSCA();
-    }
-        
-    protected void setUpOSGi() throws Exception {
-        OSGiTestUtil.setUpFelixTestRuntime();
-    }
-    
-    protected void setUpSCA() throws Exception {
-        //Create a test embedded SCA domain
-        ClassLoader cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
-                contributionService, "V1");
-        supplyChainV1.setUpSCA();
-
-        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
-                contributionService, "V2");
-        supplyChainV2.setUpSCA();
-    }
-
-	
-
-	@Override
-    public void tearDown() throws Exception {
-
-
-        supplyChainV1.tearDownSCA();
-        supplyChainV2.tearDownSCA();
-        
-        domain.stop();
-
-        domain.close();
-        
-        OSGiTestUtil.shutdownOSGiRuntime();
-	}
-
-    
-    @SuppressWarnings("unchecked")
-    public void test() throws Exception {
-        
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = supplyChainV1.supplychainContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class customerClass = customerClassRef.getJavaClass();
-        
-        Object customer = 
-            domain.getService(customerClass, "CustomerComponent");
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        ClassReference customerClassRefV2 = new ClassReference("supplychain.customer.Customer");
-        customerClassRefV2 = supplyChainV2.supplychainContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRefV2);
-        Class customerClassV2 = customerClassRefV2.getJavaClass();
-        
-        Object customerV2 = 
-            domain.getService(customerClassV2, "CustomerComponentV2");
-                
-        Method mV2 = customerClassV2.getMethod("purchaseGoods");
-        mV2.invoke(customerV2);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        
-        System.out.println("Test complete");
-        
-    }
-    
-    private class SupplyChain {
-        
-        private String folderName;
-        private ContributionService contributionService;
-        private String version;
-        
-        private Contribution supplychainContribution;
-        
-        
-        public SupplyChain(String folderName, ContributionService contributionService, String version) {
-            this.folderName = folderName;
-            this.contributionService = contributionService;
-            this.version = version;
-        }
-        
-        protected void setUpSCA() throws Exception {
-            File supplychainLocation = new File(folderName + "/SupplyChain" + version + ".jar");
-            URL supplychainContribURL = supplychainLocation.toURL();
-
-            
-            String supplychainURI = "SupplyChain" + version;
-
-            supplychainContribution = contributionService.contribute(
-                    supplychainURI, supplychainContribURL, true);
-            
-            for (Composite deployable : supplychainContribution.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            // Start Components from my composite
-            for (Composite deployable : supplychainContribution.getDeployables() ) {
-                domain.getCompositeActivator().activate(deployable);
-                domain.getCompositeActivator().start(deployable);
-            }
-        }
-
-        public void tearDownSCA() throws Exception {
-            // Remove the contribution from the in-memory repository
-            contributionService.remove("SupplyChain" + version);
-            
-            // Stop Components from my composite
-            for (Composite deployable : supplychainContribution.getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-
-        }
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
deleted file mode 100644
index 03372349f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ /dev/null
@@ -1,257 +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.contribution.osgi.test;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Hashtable;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
-import org.apache.tuscany.sca.contribution.osgi.impl.OSGiModelResolverImpl;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/*
- * 
- * Supplychain using OSGi contributions, using an OSGi ModelResolver
- * 
- * Notes:
- *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
- *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
- *    
- *    All dependent OSGi contribution bundles should be installed before the referring contribution.
- *    Hence dependencies should be a tree and cannot contain cycles.
- *    
- *    For Jar files contained within OSGi bundles, Bundle-Classpath should be
- *    set so that standard OSGi class resolution is sufficient to resolve classes containing in
- *    nested jars or bundles.
- */
-
-public class OSGiResolverTestCase extends TestCase {
-
-
-    protected  EmbeddedSCADomain domain;
-    protected BundleContext bundleContext;
-    
-    private SupplyChain supplyChainV1;
-    private SupplyChain supplyChainV2;
-  
-    @Override
-    protected void setUp() throws Exception {
-    
-        setUpOSGi();
-        setUpSCA();
-    }
-        
-    protected void setUpOSGi() throws Exception {
-        bundleContext = OSGiTestUtil.setUpOSGiTestRuntime();
-    }
-    
-    protected void setUpSCA() throws Exception {
-        //Create a test embedded SCA domain
-        ClassLoader cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
-                contributionService, "V1");
-        supplyChainV1.setUpSCA();
-
-        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
-                contributionService, "V2");
-        supplyChainV2.setUpSCA();
-    }
-
-	
-
-	@Override
-    public void tearDown() throws Exception {
-
-
-        supplyChainV1.tearDownSCA();
-        supplyChainV2.tearDownSCA();
-        
-        domain.stop();
-
-        domain.close();
-        
-        OSGiTestUtil.shutdownOSGiRuntime();
-	}
-
-    
-    @SuppressWarnings("unchecked")
-    public void test() throws Exception {
-        
-        Class customerClass = supplyChainV1.customerBundle.loadClass("supplychain.customer.Customer");
-        
-        Object customer = 
-            domain.getService(customerClass, "CustomerComponent");
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        Class customerClassV2 = supplyChainV2.customerBundle.loadClass("supplychain.customer.Customer");
-        
-        Object customerV2 = 
-            domain.getService(customerClassV2, "CustomerComponentV2");
-                
-        Method mV2 = customerClassV2.getMethod("purchaseGoods");
-        mV2.invoke(customerV2);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        
-        System.out.println("Test complete");
-        
-    }
-    
-    private class SupplyChain {
-        
-        private String folderName;
-        private ContributionService contributionService;
-        private String version;
-        
-        private Bundle customerBundle;
-
-
-        private Contribution customerContribution;
-        private Contribution retailerContribution;
-        private Contribution warehouseContribution;
-        private Contribution shipperContribution;
-        
-        
-        public SupplyChain(String folderName, ContributionService contributionService, String version) {
-            this.folderName = folderName;
-            this.contributionService = contributionService;
-            this.version = version;
-        }
-        
-        protected void setUpSCA() throws Exception {
-            File customerLocation = new File(folderName + "/Customer" + version + ".jar");
-            URL customerContribURL = customerLocation.toURL();
-            File retailerLocation = new File(folderName + "/Retailer" + version + ".jar");
-            URL retailerContribURL = retailerLocation.toURL();
-            File warehouseLocation = new File(folderName + "/Warehouse" + version + ".jar");
-            URL warehouseContribURL = warehouseLocation.toURL();
-            File shipperLocation = new File(folderName + "/Shipper" + version + ".jar");
-            URL shipperContribURL = shipperLocation.toURL();
-            
-            customerBundle = bundleContext.installBundle(customerContribURL.toString());
-            Bundle retailerBundle = bundleContext.installBundle(retailerContribURL.toString());
-            Bundle warehouseBundle = bundleContext.installBundle(warehouseContribURL.toString());
-            Bundle shipperBundle = bundleContext.installBundle(shipperContribURL.toString());
-                
-            Hashtable<String,Bundle> bundles = new Hashtable<String,Bundle>();
-            bundles.put("Customer" + version + ".jar", customerBundle);
-            bundles.put("Retailer" + version + ".jar", retailerBundle);
-            bundles.put("Warehouse" + version + ".jar", warehouseBundle);
-            bundles.put("Shipper" + version + ".jar", shipperBundle);
-            
-            ModelResolver customerResolver = new OSGiModelResolverImpl(bundles);
-            
-            bundles = new Hashtable<String,Bundle>();
-            bundles.put("Retailer" + version + ".jar", retailerBundle);
-            ModelResolver retailerResolver = new OSGiModelResolverImpl(bundles);
-            
-            bundles = new Hashtable<String,Bundle>();
-            bundles.put("Warehouse" + version + ".jar", warehouseBundle);
-            ModelResolver warehouseResolver = new OSGiModelResolverImpl(bundles);
-            
-            bundles = new Hashtable<String,Bundle>();
-            bundles.put("Shipper" + version + ".jar", shipperBundle);
-            ModelResolver shipperResolver = new OSGiModelResolverImpl(bundles);
-
-
-            shipperContribution = contributionService.contribute(
-                        "Shipper" + version,
-                        shipperContribURL, shipperResolver, false);
-            warehouseContribution = contributionService.contribute(
-                        "Warehouse" + version,
-                        warehouseContribURL, warehouseResolver, false);
-            retailerContribution = contributionService.contribute(
-                        "Retailer" + version,
-                        retailerContribURL, retailerResolver, false);                
-               
-            customerContribution = contributionService.contribute(
-                        "Customer" + version,
-                        customerContribURL, customerResolver, false);
-             
-            for (Composite deployable : customerContribution.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-
-            for (Composite deployable : retailerContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : warehouseContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : shipperContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            // Start Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().activate(deployable);
-                domain.getCompositeActivator().start(deployable);
-            }
-        }
-
-        public void tearDownSCA() throws Exception {
-            // Remove the contribution from the in-memory repository
-            contributionService.remove("Customer" + version);
-            contributionService.remove("Retailer" + version);
-            contributionService.remove("Warehouse" + version);
-            contributionService.remove("Shipper" + version);
-
-
-            // Stop Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-
-        }
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
deleted file mode 100644
index a2b3a7bc92..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ /dev/null
@@ -1,240 +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.contribution.osgi.test;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/*
- * 
- * Supplychain using OSGi contributions, using default SCA resolver
- * 
- *    This test uses two sets of four contributions where each set contains a bundle corresponding
- *    to the four components of supplychain (customer, retailer, warehouse and shipper).
- *    Tests classes from the bundle used in <implementation.java/>, and the bundles themselves
- *    used as the bundle in <implementation.osgi/>.
- * 
- * Notes:
- *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
- *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
- *    
- *    Notes:
- *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
- *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
- *    
- *    All dependent OSGi contribution bundles should be installed before the referring contribution.
- *    Hence dependencies should be a tree and cannot contain cycles.
- *    
- *    For Jar files contained within OSGi bundles, Bundle-Classpath should be
- *    set so that standard OSGi class resolution is sufficient to resolve classes containing in
- *    nested jars or bundles.
- */
-
-public class SCAResolverTestCase extends TestCase {
-
-
-    protected  EmbeddedSCADomain domain;
-    
-    private SupplyChain supplyChainV1;
-    private SupplyChain supplyChainV2;
-    
-    
-    protected String customerJarName = "Customer";
-    protected String retailerJarName = "Retailer";
-    protected String warehouseJarName = "Warehouse";
-    protected String shipperJarName = "Shipper";
-    
-    
-    
-    @Override
-    protected void setUp() throws Exception {
-    
-        setUpOSGi();
-        setUpSCA();
-    }
-        
-    protected void setUpOSGi() throws Exception {
-       OSGiTestUtil.setUpFelixTestRuntime();
-    }
-    
-    protected void setUpSCA() throws Exception {
-        //Create a test embedded SCA domain
-        ClassLoader cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
-                contributionService, "V1");
-        supplyChainV1.setUpSCA();
-
-        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
-                contributionService, "V2");
-        supplyChainV2.setUpSCA();
-    }
-
-	
-
-	@Override
-    public void tearDown() throws Exception {
-
-
-        supplyChainV1.tearDownSCA();
-        supplyChainV2.tearDownSCA();
-        
-        domain.stop();
-
-        domain.close();
-        
-        OSGiTestUtil.shutdownOSGiRuntime();
-	}
-
-    
-    @SuppressWarnings("unchecked")
-    public void test() throws Exception {
-        
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = supplyChainV1.customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class customerClass = customerClassRef.getJavaClass();
-        
-        Object customer = 
-            domain.getService(customerClass, "CustomerComponent");
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        ClassReference customerClassRefV2 = new ClassReference("supplychain.customer.Customer");
-        customerClassRefV2 = supplyChainV2.customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRefV2);
-        Class customerClassV2 = customerClassRefV2.getJavaClass();
-        
-        Object customerV2 = 
-            domain.getService(customerClassV2, "CustomerComponentV2");
-                
-        Method mV2 = customerClassV2.getMethod("purchaseGoods");
-        mV2.invoke(customerV2);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        
-        System.out.println("Test complete");
-        
-    }
-    
-    private class SupplyChain {
-        
-        private String folderName;
-        private ContributionService contributionService;
-        private String version;
-        
-        private Contribution customerContribution;
-        private Contribution retailerContribution;
-        private Contribution warehouseContribution;
-        private Contribution shipperContribution;
-        
-        
-        public SupplyChain(String folderName, ContributionService contributionService, String version) {
-            this.folderName = folderName;
-            this.contributionService = contributionService;
-            this.version = version;
-        }
-        
-        protected void setUpSCA() throws Exception {
-            File customerLocation = new File(folderName + "/" + customerJarName + version + ".jar");
-            URL customerContribURL = customerLocation.toURL();
-            File retailerLocation = new File(folderName + "/" + retailerJarName + version + ".jar");
-            URL retailerContribURL = retailerLocation.toURL();
-            File warehouseLocation = new File(folderName + "/" + warehouseJarName + version + ".jar");
-            URL warehouseContribURL = warehouseLocation.toURL();
-            File shipperLocation = new File(folderName + "/" + shipperJarName + version + ".jar");
-            URL shipperContribURL = shipperLocation.toURL();
-            
-            shipperContribution = contributionService.contribute("Shipper"
-                    + version, shipperContribURL, true);
-            warehouseContribution = contributionService.contribute("Warehouse"
-                    + version, warehouseContribURL, true);
-            retailerContribution = contributionService.contribute("Retailer"
-                    + version, retailerContribURL, true);
-            customerContribution = contributionService.contribute("Customer"
-                    + version, customerContribURL, true);
-            
-
-            for (Composite deployable : customerContribution.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-
-            for (Composite deployable : retailerContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : warehouseContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : shipperContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            // Start Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().activate(deployable);
-                domain.getCompositeActivator().start(deployable);
-            }
-        }
-
-        public void tearDownSCA() throws Exception {
-            // Remove the contribution from the in-memory repository
-            contributionService.remove("Customer" + version);
-            contributionService.remove("Retailer" + version);
-            contributionService.remove("Warehouse" + version);
-            contributionService.remove("Shipper" + version);
-
-
-            // Stop Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-
-        }
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
deleted file mode 100644
index ea8d272a0c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ /dev/null
@@ -1,44 +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.    
-#
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0 \
- org.osgi.util.tracker; version=1.3.2 
-
-
-felix.auto.start.1= \     
-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 
-
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
-
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-obr.shell.telnet=on
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-contribution/pom.xml
deleted file mode 100644
index d6340f4541..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-contribution/pom.xml
+++ /dev/null
@@ -1,52 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-osgi</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany OSGi Contribution Tests</name>
-
-    <modules>
-        <module>contribution-classes</module>
-        <module>contribution-classes-v2</module>
-        <module>contribution-test</module>
-    </modules>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/build-bundles.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/build-bundles.xml
deleted file mode 100644
index 53bf014546..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/build-bundles.xml
+++ /dev/null
@@ -1,48 +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 name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-    </target>
-
-    <!-- Add a file to a jar file, into a different path in the jar file -->
-    <target name="update-bundle">
-
-        <copy overwrite="true" todir="${files.dir}/${target.dir}" >
-            <fileset dir="${files.dir}/${source.dir}" includes="${files.list}" />
-        </copy>
-        <jar update="true" jarfile="${jar.dir}/${jar.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}" />
-        </jar>
-        <delete>
-            <fileset dir="${files.dir}/${target.dir}" includes="${files.list}" />
-        </delete>
-    </target>
-
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/pom.xml
deleted file mode 100644
index 4f7cda6820..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/pom.xml
+++ /dev/null
@@ -1,1220 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-implementation</artifactId>
-    <name>Apache Tuscany SCA OSGi-SCA Integration Tests</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.1</version>
-            <!-- Exclude the javax.servlet to avoid conflict -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>javax.servlet</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-            <finalName>itest-osgi-implementation</finalName>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.0</version>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>add-test-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>target/sdo-source</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.tuscany.sdo</groupId>
-                    <artifactId>tuscany-sdo-plugin</artifactId>
-                    <version>1.1-incubating</version>
-                    <executions>
-                        <execution>
-                            <id>generate-helloworld-sdo</id>
-                            <phase>generate-sources</phase>
-                            <configuration>
-                                <schemaFile>${basedir}/src/main/resources/sdo/ds/helloworld.wsdl</schemaFile>
-                                <javaPackage>helloworld.sdo</javaPackage>
-                                <prefix>Helloworld</prefix>
-                                <noNotification>true</noNotification>
-                                <noContainer>true</noContainer>
-                                <noUnsettable>true</noUnsettable>
-                            </configuration>
-                            <goals>
-                                <goal>generate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
-
-                    <dependencies>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-trax</artifactId>
-                            <version>1.6.5</version>
-                        </dependency>
-                    </dependencies>                    
-            
-                    <executions>
-                        <execution>
-                            <id>create-bundles</id>
-                            <phase>generate-test-sources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class \
-                                                    supplychain/retailer/OSGiRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/wiring/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/wiring/ds/Retailer1.xml \
-                                                    osgi/wiring/ds/Retailer2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/wiring/ds/Shipper1.xml \
-                                                    osgi/wiring/ds/Shipper2.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/wiring/ds/Warehouse1.xml \
-                                                    osgi/wiring/ds/Warehouse2.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class \
-                                                    supplychain/customer/OSGiStatelessCustomerImpl.class \
-                                                    supplychain/customer/OSGiCustomerFactoryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class \
-                                                    supplychain/retailer/OSGiRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class \
-                                                    supplychain/shipper/OSGiStatelessShipperServiceImpl.class \
-                                                    supplychain/shipper/OSGiShipperFactoryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/factory/ds/Customer.xml \
-                                                    supplychain/customer/OSGiStatelessCustomerComponentImpl.class \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/factory/ds/Retailer1.xml \
-                                                    osgi/factory/ds/Retailer2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/factory/ds/Shipper1.xml \
-                                                    osgi/factory/ds/Shipper2.xml \
-                                                    supplychain/shipper/OSGiStatelessShipperComponentImpl.class \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/factory/ds/Warehouse.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class \
-                                                    supplychain/retailer/OSGiRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/services/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/services/ds/Retailer1.xml \
-                                                    osgi/services/ds/Retailer2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/services/ds/Shipper1.xml \
-                                                    osgi/services/ds/Shipper2.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/services/ds/Warehouse1.xml \
-                                                    osgi/services/ds/Warehouse2.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerWithQueryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/retailer/RetailerQuery.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerWithQueryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/interfaces/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerWithQueryComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/retailer/RetailerQuery.class \
-                                                    osgi/interfaces/ds/Retailer.xml \
-                                                    supplychain/retailer/OSGiRetailerWithQueryComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/interfaces/ds/Shipper.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Customer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiVersionedCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Retailer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Shipper1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Warehouse1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Customer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiVersionedCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Retailer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Shipper2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Warehouse2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Customer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/version/ds/CustomerV1.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Customer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/version/ds/CustomerV2.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Retailer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/version/ds/Retailer1V1.xml \
-                                                    osgi/version/ds/Retailer2V1.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Retailer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/version/ds/Retailer1V2.xml \
-                                                    osgi/version/ds/Retailer2V2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Shipper1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/version/ds/Shipper1V1.xml \
-                                                    osgi/version/ds/Shipper2V1.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Shipper2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/version/ds/Shipper1V2.xml \
-                                                    osgi/version/ds/Shipper2V2.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Warehouse1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/version/ds/Warehouse1V1.xml \
-                                                    osgi/version/ds/Warehouse2V1.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Warehouse2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/version/ds/Warehouse1V2.xml \
-                                                    osgi/version/ds/Warehouse2V2.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/ws" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorld.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/ws/HelloWorld.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/HelloWorld.class \
-                                                    helloworld/OSGiHelloWorldImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/passbyref" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Greetings.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/passbyref/Greetings.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/Greetings.class \
-                                                    helloworld/OSGiGreetingsImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/callback" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="CallbackClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/callback/CallbackClient.mf" />
-                                    <property name="files.list"
-                                        value="callback/client/CallbackClient.class \
-                                                    callback/client/CallbackCallback.class \
-                                                    callback/client/OSGiCallbackClientImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/callback" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="CallbackService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/callback/CallbackService.mf" />
-                                    <property name="files.list"
-                                        value="callback/service/CallbackService.class \
-                                                    callback/service/OSGiCallbackServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalClient.mf" />
-                                    <property name="files.list"
-                                        value="conversation/client/ConversationalClientStatefulImpl.class \
-                                                    conversation/client/ConversationalClientStatelessImpl.class \
-                                                    conversation/client/ConversationalCallback.class \
-                                                    conversation/client/ConversationalClient.class \
-                                                    conversation/client/ConversationalClientServiceFactory.class \
-                                                    conversation/client/ConversationalClientActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalReferenceClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalReferenceClient.mf" />
-                                    <property name="files.list"
-                                        value="conversation/referenceclient/ConversationalReferenceClient.class \
-                                                    conversation/referenceclient/ConversationalReferenceClientImpl.class \
-                                                    conversation/referenceclient/ConversationalReferenceClientActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalService.mf" />
-                                    <property name="files.list"
-                                        value="conversation/service/ConversationalService.class \
-                                                    conversation/service/ConversationalServiceStatefulImpl.class \
-                                                    conversation/service/ConversationalServiceStatelessImpl.class
-                                                    conversation/service/ConversationalServiceFactory.class \
-                                                    conversation/service/ConversationalServiceActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalService.mf" />
-                                    <property name="files.list"
-                                        value="conversation/ConversationalService.class \
-                                                    conversation/ConversationalServiceStatefulImpl.class \
-                                                    conversation/ConversationalServiceStatelessImpl.class
-                                                    conversation/ConversationalServiceFactory.class \
-                                                    conversation/OSGiConversationTestActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuote.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/StockQuote.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    stockquote/OSGiStockQuoteImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuote.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/ds/StockQuote.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    osgi/properties/ds/StockQuote.xml \
-                                                    stockquote/OSGiStockQuoteComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuoteFactory.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/StockQuoteFactory.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    stockquote/OSGiStockQuoteImpl.class \
-                                                    stockquote/OSGiStockQuoteFactoryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuoteFactory.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/ds/StockQuoteFactory.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    osgi/properties/ds/StockQuoteFactory.xml \
-                                                    stockquote/OSGiStockQuoteComponentImpl.class" />
-              
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/sdo/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorldService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/sdo/ds/HelloWorldService.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/sdo/HelloWorldService.class \
-                                               osgi/sdo/ds/HelloWorldService.xml \
-                                               helloworld/sdo/impl/* \
-                                               helloworld/sdo/Name.class \
-                                               helloworld/sdo/getGreetings* \
-                                               helloworld/sdo/HelloworldFactory.class \
-                                               helloworld/sdo/HelloWorldServiceComponent.class" />
-              
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/sdo/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorldClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/sdo/ds/HelloWorldClient.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/sdo/client/HelloWorldClient.class \
-                                               osgi/sdo/ds/HelloWorldClient.xml \
-                                               sdo/ds/helloworldsdo.composite \
-                                               helloworld/sdo/client/HelloWorldClientComponent.class" />
-              
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="update-bundle">
-                                    <property name="jar.dir"
-                                        value="target/classes/sdo/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorldClient.jar" />
-                                    <property name="source.dir"
-                                        value="sdo/ds" />
-                                    <property name="target.dir"
-                                        value="." />
-                                    <property name="files.list"
-                                        value="HelloWorldClient.componentType \
-                                               HelloWorldService.componentType \
-                                               META-INF/sca-contribution.xml" />
-              
-                                </ant>
-
-                                </tasks>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
deleted file mode 100644
index cfecd989fe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ /dev/null
@@ -1,33 +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 callback.client;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/*
- * Callback interface
- */
-public interface CallbackCallback {
-
-    public void callbackMessage(String aString);
-
-    public void callbackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
deleted file mode 100644
index 43bc26f2f5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ /dev/null
@@ -1,31 +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 callback.client;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- * Callback test client interface
- */
-public interface CallbackClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
deleted file mode 100644
index f78878ef47..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ /dev/null
@@ -1,141 +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 callback.client;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import callback.service.CallbackService;
-
-@Service(CallbackClient.class)
-/**
- * Callback test client implementation
- */
-public class JavaCallbackClientImpl implements CallbackClient, CallbackCallback {
-
-	@Reference
-    protected CallbackService callbackService;
-	
-    private static String returnMessage = null;
-    private static int callbackCount = 0;
-    private static Object monitor = new Object();
-
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-
-    private void test1a() {
-        callbackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we cant get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallbackITest - test1a", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test1b() {
-        callbackService.noCallback("No Reply Desired");
-        Assert.assertEquals("CallbackITest - test1b", 1, 1);
-
-        return;
-    }
-
-    private void test1c() {
-        callbackService.multiCallback("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallbackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallbackITest - test1c", 3, this.getCallbackCount());
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallbackCount() {
-        return callbackCount;
-    }
-
-    public void incrementCallbackCount() {
-        callbackCount++;
-    }
-
-    public void callbackMessage(String aString) {
-        System.out.println("Entering callback callbackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callbackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallbackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
deleted file mode 100644
index 1c65ca573b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ /dev/null
@@ -1,181 +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 callback.client;
-
-import java.util.Hashtable;
-
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import callback.service.CallbackService;
-
-/**
- * OSGi Callback test client implementation
- */
-public class OSGiCallbackClientImpl implements 
-        CallbackClient, CallbackCallback, BundleActivator {
-
-    protected CallbackService callbackService;
-    
-    private static String returnMessage = null;
-    private static int callbackCount = 0;
-    private static Object monitor = new Object();
-    
-    private BundleContext bundleContext;
-
-    public void run() {
-        
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-    
-   
-
-    private void test1a() {
-        callbackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (!"Who's There".equals(this.getReturnMessage())) {
-           throw new RuntimeException("CallbackITest - test1a");
-        }
-
-    }
-
-    private void test1b() {
-        callbackService.noCallback("No Reply Desired");
-
-        return;
-    }
-
-    private void test1c() {
-        callbackService.multiCallback("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallbackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (this.getCallbackCount() != 3)
-            throw new RuntimeException("CallbackITest - test1c");
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallbackCount() {
-        return callbackCount;
-    }
-
-    public void incrementCallbackCount() {
-        callbackCount++;
-    }
-
-    public void callbackMessage(String aString) {
-        System.out.println("Entering callback callbackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callbackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallbackCount();
-            monitor.notify();
-        }
-    }
-
-    
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiCallbackClientImpl bundle ");
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "CallbackClient/CallbackClient");
-
-        serviceProps.put("component.name", "CallbackClient");        
-        bundleContext.registerService("callback.client.CallbackClient", this, serviceProps);
-        
-        Hashtable<String, Object> callbackProps = new Hashtable<String, Object>();
-        callbackProps.put("component.service.name", "CallbackClient/callbackService");
-        callbackProps.put("component.name", "CallbackClient");
-        
-        bundleContext.registerService("callback.client.CallbackCallback", this, callbackProps);
-        
-        ServiceReference ref= bundleContext.getServiceReference("callback.service.CallbackService");
-        
-        if (ref != null)
-            callbackService = (callback.service.CallbackService)bundleContext.getService(ref);
-        
-        
-        
-      
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-  
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
deleted file mode 100644
index 5383e1e268..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/CallbackService.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 callback.service;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-import callback.client.CallbackCallback;
-
-@Remotable
-@Callback(CallbackCallback.class)
-/*
- * Callback service interface
- */
-public interface CallbackService {
-
-    public void knockKnock(String aString);
-
-    public void noCallback(String aString);
-
-    public void multiCallback(String aString);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
deleted file mode 100644
index b2af2fa68d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ /dev/null
@@ -1,68 +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 callback.service;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-import callback.client.CallbackCallback;
-
-@Service(CallbackService.class)
-/*
- * Callback service implementation
- */
-public class JavaCallbackServiceImpl implements CallbackService {
-
-    private CallbackCallback callback;
-    
-    @Callback
-    protected void setCallback(CallbackCallback callback) {
-        this.callback = callback;
-    }
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackMessage("Who's There");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackIncrement("Who's There 1");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 2");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 3");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        // System.out.println("CallbackServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
deleted file mode 100644
index c05a3f52a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ /dev/null
@@ -1,95 +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 callback.service;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-
-import callback.client.CallbackCallback;
-
-/*
- * OSGi Callback service implementation
- */
-public class OSGiCallbackServiceImpl implements CallbackService, BundleActivator {
-
-    @Callback
-    protected CallbackCallback callback;
-    
-    
-    private BundleContext bundleContext;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackMessage("Who's There");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackIncrement("Who's There 1");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 2");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 3");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        // System.out.println("CallbackServiceImpl No response desired");
-        return;
-
-    }
-    
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiCallbackServiceImpl bundle ");
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "CallbackService/CallbackService");
-        bundleContext.registerService("callback.service.CallbackService", this, serviceProps);
-        
-       
-        ServiceReference ref= bundleContext.getServiceReference("callback.client.CallbackCallback");
-        
-        if (ref != null)
-            callback = (CallbackCallback)bundleContext.getService(ref);
-        
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-    
-  
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
deleted file mode 100644
index c92f078e49..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +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 conversation.client;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@Conversational
-public interface ConversationalCallback {
-	
-    public void init();
-    
-    public void destroy();
-    
-    public void initializeCount(int count);
-    
-    public void incrementCount();
-    
-    public int retrieveCount();
-    
-    public void businessException() throws Exception;        
-    
-    @EndsConversation
-    public String endConversation();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
deleted file mode 100644
index af269052c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ /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.    
- */
-package conversation.client;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The client for the conversational itest. Is implemented by clients
- * offering both stateless and stateful callbacks
- *
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface ConversationalClient { 
-	
-	public int runConversationFromInjectedReference(); 	
-	public int runConversationFromServiceReference();
-	public int runConversationWithUserDefinedConversationId();
-	public String runConversationCheckUserDefinedConversationId();	
-	public int runConversationCheckingScope();
-	public int runConversationWithCallback(); 
-	public int runConversationHavingPassedReference();
-	public String runConversationBusinessException();
-	public String runConversationBusinessExceptionCallback();
-	public int runConversationCallingEndedConversation();
-	public int runConversationCallingEndedConversationCallback();
-	public int runConversationAgeTimeout();
-	public int runConversationIdleTimeout();
-	public int runConversationPrincipleError();	
-    
-    public String getCalls();
-    public String getServiceCalls();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
deleted file mode 100644
index 5eb16be597..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ /dev/null
@@ -1,105 +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 conversation.client;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-import conversation.client.ConversationalCallback;
-import conversation.client.ConversationalClient;
-import conversation.client.ConversationalClientStatefulImpl;
-import conversation.client.ConversationalClientStatelessImpl;
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalClientActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationClientActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-         
-        serviceProps.put("component.name", "ConversationalStatelessClientStatelessService");
-        Object statelessClientFactory1 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 1);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statelessClientFactory1, 
-                serviceProps);
-      
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatelessClientStatefulService");       
-        Object statelessClientFactory2 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 2);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statelessClientFactory2,
-                serviceProps);
-        
-            
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatefulClientStatelessService");
-        Object statefulClientFactory1 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 3);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statefulClientFactory1, 
-                serviceProps);
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatefulClientStatefulService");
-        Object statefulClientFactory2 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 4);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statefulClientFactory2, 
-                serviceProps);
-      
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
deleted file mode 100644
index 8479624546..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ /dev/null
@@ -1,135 +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 conversation.client;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-import conversation.client.ConversationalClientStatefulImpl;
-import conversation.client.ConversationalClientStatelessImpl;
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-public class ConversationalClientServiceFactory implements ServiceFactory {
-    
-    private Class<?> clazz;
-    private BundleContext bundleContext;
-    private int serviceNum;
-    
-    public ConversationalClientServiceFactory(Class<?> clazz, BundleContext bundleContext, int serviceNum) {
-        this.clazz = clazz;
-        this.bundleContext = bundleContext;
-        this.serviceNum = serviceNum;
-    }
-
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-
-
-        try {
-            Object instance = clazz.newInstance();
-            
-            ConversationalClientStatelessImpl statelessClient = null;
-            ConversationalClientStatefulImpl statefulClient = null;
-            
-            if (serviceNum == 1 || serviceNum == 2) {
-                
-                ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName());
-                statelessClient  = (ConversationalClientStatelessImpl)instance;
-                statelessClient.conversationalReferenceClient = 
-                    (ConversationalReferenceClient)bundleContext.getService(ref);
-            }
-            if (serviceNum == 1) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateless)");
-                statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            if (serviceNum == 2) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateful)");
-                statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-
-            if (serviceNum == 3 || serviceNum == 4) {
-                
-                ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName());
-                statefulClient  = (ConversationalClientStatefulImpl)instance;
-                statefulClient.conversationalReferenceClient = 
-                    (ConversationalReferenceClient)bundleContext.getService(ref);
-            }
-            if (serviceNum == 3) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateless)");
-                statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            if (serviceNum == 4) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateful)");
-                statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            return instance;
-        } catch (Exception e) {
-            
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) {
-    	
-    }
-    
-    private ServiceReference getServiceReference(String name, String filter) throws Exception {
-        
-        ServiceReference refs[] = bundleContext.getServiceReferences(name, filter);
-        ServiceReference ref = refs[0];
-        int ranking = 0;
-        if (ref.getProperty(Constants.SERVICE_RANKING) instanceof Integer)
-            ranking = (Integer)ref.getProperty(Constants.SERVICE_RANKING);
-        for (int i = 1; i < refs.length; i++) {
-            int thisranking = 0;
-            if (refs[i].getProperty(Constants.SERVICE_RANKING) instanceof Integer) {
-                thisranking = (Integer)refs[i].getProperty(Constants.SERVICE_RANKING);
-            }
-            if (thisranking > ranking) {
-                ref = refs[i];
-                ranking = thisranking;
-            }
-        }
-        
-        return ref;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 3aedabc29c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,254 +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 conversation.client;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
-                        maxIdleTime="5 minutes",
-                        singlePrincipal=false)
-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-    
-    @Context
-    protected ComponentContext componentContext;
-    
-    protected ConversationalService conversationalService;
-    
-    protected ConversationalReferenceClient conversationalReferenceClient;
-      
-    private int clientCount = 0;
-    private int callbackCount = 0;  
-    
-    
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();        
-	
-    // From ConversationalClient
-	public int runConversationFromInjectedReference(){
-	    calls.append("runConversationFromInjectedReference,");	    
-	    conversationalService.initializeCount(1);
-	    conversationalService.incrementCount();
-	    clientCount = conversationalService.retrieveCount();
-	    conversationalService.endConversation();
-	    
-	    return clientCount;
-	}
-    public int runConversationFromServiceReference(){
-        calls.append("runConversationFromServiceReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }	
-    public int runConversationWithUserDefinedConversationId(){
-        calls.append("runConversationWithUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation1");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }    
-    public String runConversationCheckUserDefinedConversationId(){
-        calls.append("runConversationCheckUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation2");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        return callableReference.endConversation();
-              
-    }      
-    public int runConversationCheckingScope(){
-        calls.append("runConversationCheckingScope,");
-        // run a conversation
-        return runConversationFromInjectedReference();
-        
-        // test will then use a static method to find out how many times 
-        // init/destroy were called
-    }    
-	public int runConversationWithCallback(){
-	    calls.append("runConversationWithCallback,");
-	    callbackCount = 2;
-        conversationalService.initializeCountCallback(1);
-        conversationalService.incrementCountCallback();
-        clientCount = conversationalService.retrieveCountCallback();
-        conversationalService.endConversationCallback();
-        
-        return clientCount;
-    } 
-    public int runConversationHavingPassedReference(){
-        calls.append("runConversationHavingPassedReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        conversationalReferenceClient.incrementCount(serviceReference);
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        serviceReference.getConversation().end();
-        
-        return clientCount;
-    }
-    public String runConversationBusinessException(){
-        calls.append("runConversationbusinessException,");      
-        try {
-            conversationalService.initializeCount(1);
-            conversationalService.businessException();
-            clientCount = conversationalService.retrieveCount();
-            conversationalService.endConversation();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }
-    
-    public String runConversationBusinessExceptionCallback(){
-        calls.append("runConversationbusinessExceptionCallback,");
-        try {
-            conversationalService.initializeCountCallback(1);
-            conversationalService.businessExceptionCallback();
-            clientCount = conversationalService.retrieveCountCallback();
-            conversationalService.endConversationCallback();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }   
-    
-    public int runConversationCallingEndedConversation(){
-        calls.append("runConversationCallingEndedConversation,");
-        conversationalService.initializeCount(1);
-        conversationalService.endConversation();
-        return conversationalService.retrieveCount();
-    }   
-    
-    public int runConversationCallingEndedConversationCallback(){
-        calls.append("runConversationCallingEndedConversationCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.endConversationCallback();
-        return conversationalService.retrieveCountCallback();
-    }  
-    
-    public int runConversationAgeTimeout(){
-        calls.append("runConversationAgeTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationIdleTimeout(){
-        calls.append("runConversationIdleTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationPrincipleError(){
-        calls.append("runConversationPrincipleError,");
-        // TODO - when policy framework is done
-        return clientCount;
-    }
-    
-    
-    // From ConversationalCallback
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,"); 
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        callbackCount += count;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        callbackCount++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        return  callbackCount;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        callbackCount = 0;
-        return null;
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-
-    public String getServiceCalls() {
-        return conversationalService.getCalls().toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
deleted file mode 100644
index b12e094bc1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,253 +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 conversation.client;
-
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("STATELESS")
-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-   
-    @Context
-    protected ComponentContext componentContext;
-    
-    @Reference 
-    protected ConversationalService conversationalService;
-    
-    @Reference
-    protected ConversationalReferenceClient conversationalReferenceClient;
-    
-    private int clientCount = 0;
-    private int callbackCount = 0;
-    
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();    
-	
-    // From ConversationalClient
-    public int runConversationFromInjectedReference(){
-        calls.append("runConversationFromInjectedReference,");
-        conversationalService.initializeCount(1);
-        conversationalService.incrementCount();
-        clientCount = conversationalService.retrieveCount();
-        conversationalService.endConversation();
-        
-        return clientCount;
-    }
-    public int runConversationFromServiceReference(){
-        calls.append("runConversationFromServiceReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }   
-    public int runConversationWithUserDefinedConversationId(){
-        calls.append("runConversationWithUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }    
-    public String runConversationCheckUserDefinedConversationId(){
-        calls.append("runConversationCheckUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation2");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        return callableReference.endConversation();
-              
-    }     
-    public int runConversationCheckingScope(){
-        calls.append("runConversationCheckingScope,");
-        // run a conversation
-        return runConversationFromInjectedReference();
-        
-        // test will then use a static method to find out how many times 
-        // init/destroy were called
-    }
-    public int runConversationWithCallback(){
-        calls.append("runConversationWithCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.incrementCountCallback();
-        clientCount = conversationalService.retrieveCountCallback();
-        conversationalService.endConversationCallback();
-        
-        return clientCount;
-    } 
-    
-    public int runConversationHavingPassedReference(){
-        calls.append("runConversationHavingPassedReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        conversationalReferenceClient.incrementCount(serviceReference);
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }	
-    
-	public String runConversationBusinessException(){
-	    calls.append("runConversationbusinessException,");	    
-	    try {
-            conversationalService.initializeCount(1);
-            conversationalService.businessException();
-            clientCount = conversationalService.retrieveCount();
-            conversationalService.endConversation();
-	    } catch(Exception ex) {
-	        return ex.getMessage();
-	    }
-         
-        return "No Exception Returned";
-    }
-	
-    public String runConversationBusinessExceptionCallback(){
-        calls.append("runConversationbusinessExceptionCallback,");
-        try {
-            conversationalService.initializeCountCallback(1);
-            conversationalService.businessExceptionCallback();
-            clientCount = conversationalService.retrieveCountCallback();
-            conversationalService.endConversationCallback();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }	
-	
-    public int runConversationCallingEndedConversation(){
-        calls.append("runConversationCallingEndedConversation,");
-        conversationalService.initializeCount(1);
-        conversationalService.endConversation();
-        return conversationalService.retrieveCount();
-    }   
-    
-    public int runConversationCallingEndedConversationCallback(){
-        calls.append("runConversationCallingEndedConversationCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.endConversationCallback();
-        return conversationalService.retrieveCountCallback();
-    }   
-    
-    public int runConversationAgeTimeout(){
-        calls.append("runConversationAgeTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationIdleTimeout(){
-        calls.append("runConversationIdleTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationPrincipleError(){
-        calls.append("runConversationPrincipleError,");
-        // TODO - when policy framework is done
-        return clientCount;
-    }
-    
-    
-    // From ConversationalCallback
-    @Init
-    public void init(){
-        calls.append("init,");
-
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-        
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        callbackCount = 0;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        callbackCount++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        return  callbackCount;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        return null;
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-    
-    public String getServiceCalls() {
-        return conversationalService.getCalls().toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
deleted file mode 100644
index 59e128b993..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.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 conversation.referenceclient;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-import conversation.service.ConversationalService;
-
-/**
- * The client that calls into an existing conversation by accepting
- * a reference to that conversation
- *
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface ConversationalReferenceClient { 
-	
-    public void incrementCount(CallableReference<ConversationalService> conversationalService);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
deleted file mode 100644
index ff6f16cba3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ /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.    
- */
-package conversation.referenceclient;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalReferenceClientActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationReferenceClientActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalReferenceClient");
-        ConversationalReferenceClientImpl refClient = new ConversationalReferenceClientImpl();
-        bundleContext.registerService(ConversationalReferenceClient.class.getName(), refClient, serviceProps);
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 4524c6bd3d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.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 conversation.referenceclient;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Service;
-
-import conversation.service.ConversationalService;
-
-/**
- * A client component that accepts a reference to an ongoing conversation
- * and takes part in that conversation
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalReferenceClient.class})
-@AllowsPassByReference
-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
-   
-    public void incrementCount(CallableReference<ConversationalService> conversationalService){
-        ConversationalService callableReference = conversationalService.getService();
-        
-        callableReference.incrementCount();        
-    }
-
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
deleted file mode 100644
index bcd24ef0b1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ /dev/null
@@ -1,65 +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 conversation.service;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@Conversational
-@Callback(ConversationalCallback.class)
-public interface ConversationalService {
-	
-    public void init();
-    
-    public void destroy();
-    
-    public void initializeCount(int count);
-    
-    public void incrementCount();
-    
-    public int retrieveCount();
-    
-    public void businessException() throws Exception;        
-    
-    public void initializeCountCallback(int count);
-    
-    public void incrementCountCallback();
-    
-    public int retrieveCountCallback();
-    
-    public void businessExceptionCallback() throws Exception;    
-    
-    @EndsConversation
-    public String endConversation();
-    
-    public String endConversationCallback();
-
-    public String getCalls();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
deleted file mode 100644
index 903f8bf229..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.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 conversation.service;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalServiceActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationServiceActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-       
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalServiceStateful");
-        Object statefulService = 
-            new ConversationalServiceFactory(ConversationalServiceStatefulImpl.class);
-        bundleContext.registerService(ConversationalService.class.getName(), statefulService, serviceProps);
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalServiceStateless");
-        ConversationalServiceStatelessImpl statelessService = new ConversationalServiceStatelessImpl();
-        bundleContext.registerService(ConversationalService.class.getName(), statelessService, serviceProps);
-        
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
deleted file mode 100644
index fe8bd23f07..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ /dev/null
@@ -1,52 +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 conversation.service;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-
-public class ConversationalServiceFactory implements ServiceFactory {
-    
-    private Class<?> clazz;
-    
-    public ConversationalServiceFactory(Class<?> clazz) {
-        this.clazz = clazz;
-    }
-
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-
-        try {
-            return clazz.newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-       
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) {
-    	
-    }
-    
-   
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index ec30d641ac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,121 +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 conversation.service;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev$ $Date$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
-                        maxIdleTime="5 minutes",
-                        singlePrincipal=false)
-public class ConversationalServiceStatefulImpl implements ConversationalService {
-
-    @ConversationID
-    protected String conversationId;
-    
-    @Callback
-    protected ConversationalCallback conversationalCallback; 
-    
-    // local count - accumulates during the conversation
-    private int count = 0;
-          
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();
-   
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");       
-        this.count = count;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");        
-        count++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,"); 
-        return count;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public void initializeCountCallback(int count){
-        calls.append("initializeCountCallback,"); 
-        this.count = count;
-        conversationalCallback.initializeCount(count);
-    }
-    
-    public void incrementCountCallback(){
-        calls.append("incrementCountCallback,"); 
-        count++;
-        conversationalCallback.incrementCount();
-    }
-    
-    public int retrieveCountCallback(){
-        calls.append("retrieveCountCallback,"); 
-        return conversationalCallback.retrieveCount();
-    }
-    
-    public void businessExceptionCallback() throws Exception {
-        calls.append("businessExceptionCallback,");        
-        conversationalCallback.businessException();
-    }    
-    
-    public String endConversation(){
-        calls.append("endConversation,"); 
-        count = 0;
-        return conversationId;
-    }
-    
-    public String endConversationCallback(){
-        calls.append("endConversationCallback,"); 
-        return conversationalCallback.endConversation();
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 34baca71d1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,127 +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 conversation.service;
-
-import java.util.HashMap;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev$ $Date$
- */
-@Service(ConversationalService.class)
-@Scope("STATELESS")
-public class ConversationalServiceStatelessImpl implements ConversationalService {
-    
-    @ConversationID
-    protected String conversationId;
-    
-    @Callback
-    protected ConversationalCallback conversationalCallback; 
-    
-    // static area in which to hold conversational data
-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
-   
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();
-   
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        Integer conversationalCount = new Integer(count); 
-        conversationalState.put(conversationId, conversationalCount);
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        Integer conversationalCount = conversationalState.get(conversationId);
-        conversationalCount++;
-        conversationalState.put(conversationId, conversationalCount);
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        Integer count = conversationalState.get(conversationId);
-        if (count != null){
-            return count.intValue();
-        } else {
-            return -999;
-        }
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }    
-    
-    public void initializeCountCallback(int count){
-        calls.append("initializeCountCallback,");
-        initializeCount(count);
-        conversationalCallback.initializeCount(count);
-    }
-    
-    public void incrementCountCallback(){
-        calls.append("incrementCountCallback,");
-        incrementCount();
-        conversationalCallback.incrementCount();
-    }
-    
-    public int retrieveCountCallback(){
-        calls.append("retrieveCountCallback,");
-        return conversationalCallback.retrieveCount();
-    }
-    
-    public void businessExceptionCallback() throws Exception {
-        calls.append("businessExceptionCallback,");        
-        conversationalCallback.businessException();
-    }
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        conversationalState.remove(conversationId);
-        return conversationId;
-    }
-    
-    public String endConversationCallback(){
-        calls.append("endConversationCallback,");       
-        return conversationalCallback.endConversation();
-    }   
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
deleted file mode 100644
index 9285c0a8d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/Greetings.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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Greetings {
-    
-    
-    public String[] getGreetingsFromJava(String[] s);
-    
-    public String[] getGreetingsFromOSGi(String[] s);
-    
-    public String[] getModifiedGreetingsFromJava(String[] s);
-    
-    public String[] getModifiedGreetingsFromOSGi(String[] s);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index 16d0eae990..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
deleted file mode 100644
index 3d0e045225..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ /dev/null
@@ -1,73 +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 helloworld;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(Greetings.class)
-@Scope("COMPOSITE")
-public class JavaGreetingsComponent implements Greetings {
-
-    private Greetings greetingsService;
-    
-    @Reference
-    public void setGreetingsService(Greetings greetingsService) {
-    	this.greetingsService = greetingsService;
-    }
-    
-   
-    public String[] getGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From Java)";
-        }
-            
-        return greetingsService.getGreetingsFromJava(s);
-    }
-    
-    public String[] getGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From Java)";
-        }
-            
-        return s;
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From Java)";
-        }
-            
-        return greetingsService.getModifiedGreetingsFromJava(s);
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From Java)";
-        }
-            
-        return s;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
deleted file mode 100644
index c055aee142..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ /dev/null
@@ -1,41 +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 helloworld;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class JavaHelloWorldComponent implements HelloWorld {
-
-    public helloworld.ws.HelloWorld helloWorldWS;
-    
-    @Reference
-    public void setHelloWorldWS(helloworld.ws.HelloWorld helloWorldWS) {
-    	this.helloWorldWS = helloWorldWS;
-    }
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-    
-   
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
deleted file mode 100644
index 661eb5a8cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ /dev/null
@@ -1,112 +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 helloworld;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.BundleActivator;
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-
-public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator {
-
-    private Greetings greetingsService;
-    
-    private BundleContext bundleContext;
-    
-    public String[] getGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From OSGi)";
-        }
-            
-        return greetingsService.getGreetingsFromOSGi(s);
-    }
-    
-    public String[] getGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From OSGi)";
-        }
-            
-        return s;
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From OSGi)";
-        }
-            
-        return greetingsService.getModifiedGreetingsFromOSGi(s);
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From OSGi)";
-        }
-            
-        return s;
-    }
-
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OsgiGreetingsImpl bundle ");
-    	
-    	this.bundleContext = bc;
-    	
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "OSGiGreetingsComponent/Greetings");
-        bundleContext.registerService("helloworld.Greetings", this, serviceProps);
-        
-        
-        ServiceReference ref = bundleContext.getServiceReference("helloworld.Greetings");
-        if (ref != null)
-            greetingsService = (helloworld.Greetings)bundleContext.getService(ref);
-        else {
-            try {
-                String filter = "(objectclass=helloworld.Greetings)";
-                this.bundleContext.addServiceListener(this, filter);                
-
-            } catch (InvalidSyntaxException e) {
-                e.printStackTrace();
-            }
-        }
-      
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-			    ServiceReference ref = event.getServiceReference();
-			    greetingsService =  (helloworld.Greetings) bundleContext.getService(ref);
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
deleted file mode 100644
index 0588da9a85..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ /dev/null
@@ -1,81 +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 helloworld;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.BundleActivator;
-
-
-public class OSGiHelloWorldImpl implements HelloWorld, ServiceListener, BundleActivator {
-
-    public helloworld.ws.HelloWorld helloWorldWS;
-    
-    private BundleContext bundleContext;
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-    
-
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OsgiHelloWorldImpl bundle ");
-    	
-    	this.bundleContext = bc;
-    	
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "HelloWorldComponent");
-        bundleContext.registerService("helloworld.HelloWorld", this, serviceProps);
-        
-        ServiceReference ref = bundleContext.getServiceReference("helloworld.ws.HelloWorld");
-        if (ref != null)
-            helloWorldWS = (helloworld.ws.HelloWorld)bundleContext.getService(ref);
-        else {
-            try {
-            	String filter = "(objectclass=helloworld.ws.HelloWorld)";
-            	this.bundleContext.addServiceListener(this, filter);				
-
-            } catch (InvalidSyntaxException e) {
-            	e.printStackTrace();
-            }
-        }
-        
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-			    ServiceReference ref = event.getServiceReference();
-			    helloWorldWS =  (helloworld.ws.HelloWorld) bundleContext.getService(ref);
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
deleted file mode 100644
index fff67e1978..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld.sdo;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    
-    public String getGreetings(Name name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
deleted file mode 100644
index 98085449e6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,33 +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 helloworld.sdo;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceComponent implements HelloWorldService {
-
-    public String getGreetings(Name name) {
-        return "Hello " + name.getFirst() + " " + name.getLast();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
deleted file mode 100644
index 5089019671..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ /dev/null
@@ -1,30 +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 helloworld.sdo.client;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld client
- */
-@Remotable
-public interface HelloWorldClient {
-    
-    public String getGreetings(String firstName, String lastName);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
deleted file mode 100644
index 1aabf4d10c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ /dev/null
@@ -1,50 +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 helloworld.sdo.client;
-
-import helloworld.sdo.HelloWorldService;
-import helloworld.sdo.HelloworldFactory;
-import helloworld.sdo.Name;
-
-/**
- * The HelloWorld client implementation
- */
-public class HelloWorldClientComponent implements HelloWorldClient {
-   
-    HelloWorldService helloWorldService;
-    
-    public String getGreetings(String firstName, String lastName) {
-        Name name = HelloworldFactory.INSTANCE.createName();
-        name.setFirst(firstName);
-        name.setLast(lastName);
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-    
-    public void unsetHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = null;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
deleted file mode 100644
index 039a214856..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ /dev/null
@@ -1,29 +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 helloworld.ws;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
deleted file mode 100644
index 4a3cd4aed2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/helloworld/ws/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 helloworld.ws;
-
-public class HelloWorldService implements HelloWorld {
-
-    public String getGreetings(String s) {
-        return "Hello " + s;
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
deleted file mode 100644
index 2251bf5be6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ /dev/null
@@ -1,86 +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 stockquote;
-
-import java.util.Dictionary;
-
-import org.osgi.service.component.ComponentContext;
-import org.osoa.sca.annotations.Property;
-
-/**
- * Declarative Stock quote with configurable properties.
- */
-public class OSGiStockQuoteComponentImpl implements StockQuote {
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    
-    public double configExchangeRate;
-    public String configCurrency;
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public double getQuote(String ticker) throws Exception {
-        
-        if (exchangeRate == 2.0 && !"USD".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        if (exchangeRate == 1.48 && !"EURO".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        if (configExchangeRate == 2.0 && !"USD".equals(configCurrency)) {
-            throw new RuntimeException("ConfigAdmin Property exchangeRate not set correctly, exchangeRate= " + 
-                    configExchangeRate + " currency=" + configCurrency);
-        }
-        if (configExchangeRate == 1.48 && !"EURO".equals(configCurrency)) {
-            throw new RuntimeException("Property configExchangeRate not set correctly, exchangeRate= " + 
-                    configExchangeRate + " currency=" + configCurrency);
-        }
-        
-        return 52.81 * exchangeRate;
-        
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiStockQuoteComponentImpl bundle ");
-        Dictionary props = context.getProperties();
-        Object prop = props.get("currency");
-        if (prop instanceof String[]&& ((String [])prop).length > 0)
-            configCurrency = ((String [])prop)[0];
-        prop = props.get("exchangeRate");
-        if (prop instanceof Double[]&& ((Double [])prop).length > 0)
-            configExchangeRate = (double)((Double [])prop)[0];
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiStockQuoteComponentImpl bundle ");
-    }
-
-    
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
deleted file mode 100644
index e2d25bf47d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ /dev/null
@@ -1,65 +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 stockquote;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * 
- * OSGi service factory where service has configurable properties
- * Only property injection is tested. ConfigurationAdmin is not used.
- *
- */
-public class OSGiStockQuoteFactoryImpl implements BundleActivator, ServiceFactory {
-    
-   
-    private BundleContext bundleContext;
-    
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bundleContext = bc;
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        bc.registerService(StockQuote.class.getName(), this, props);
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-
-    public Object getService(Bundle bundle, ServiceRegistration registration) {
-        return new OSGiStockQuoteImpl(bundleContext);
-    }
-
-
-    public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
-        
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
deleted file mode 100644
index f2ae804ad1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ /dev/null
@@ -1,119 +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 stockquote;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osoa.sca.annotations.Property;
-
-/**
- * 
- * Stock quote with configurable properties.
- *
- */
-public class OSGiStockQuoteImpl implements StockQuote, BundleActivator {
-    
-    public String pid;
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    private BundleContext bundleContext;
-    
-    public OSGiStockQuoteImpl() {     
-        this.pid = "stockQuote";
-    }
-    
-    protected OSGiStockQuoteImpl(BundleContext bc) {
-        this.bundleContext = bc;
-    }
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-     
-    private void checkProperties() throws Exception {
-               
-        if (exchangeRate == 2.0 && !"USD".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        if (exchangeRate == 1.48 && !"EURO".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        ServiceReference configAdminReference = bundleContext.getServiceReference("org.osgi.service.cm.ConfigurationAdmin");
-        if (configAdminReference != null && pid != null ) {
-            
-            ConfigurationAdmin cm = (ConfigurationAdmin)bundleContext.getService(configAdminReference);
-            
-            Configuration config = cm.getConfiguration("stockQuote", null);
-            
-            Dictionary props = config.getProperties();
-            
-            if (exchangeRate != (double)(Double)props.get("exchangeRate")) {
-                throw new Exception("Config Property exchangeRate not set correctly, expected " 
-                        + props.get("exchangeRate") + " got " + exchangeRate);
-            }
-            
-            if (!currency.equals(props.get("currency"))) {
-                throw new Exception("Config Property currency not set correctly, expected " 
-                        + props.get("currency") + " got " + currency);
-            }
-        }
-        
-    }
-    
-    public double getQuote(String ticker) throws Exception {
-        
-        checkProperties();
-       
-        return 52.81 * exchangeRate;
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bundleContext = bc;
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        props.put("service.pid", "stockQuote");
-        
-        bc.registerService(StockQuote.class.getName(), this, props);
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
deleted file mode 100644
index a47f68c579..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ /dev/null
@@ -1,31 +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 stockquote;
-
-/**
- * 
- * Stock Quote interface
- *
- */
-public interface StockQuote {
-    
-    public double getQuote(String ticker) throws Exception ;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 25d7bcf2ff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,163 +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 supplychain;
-
-
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * This class implements the Customer service component.
- */
-public  class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    String[] referenceFilters;
-    
-    Class myClass;
-    ArrayList<String> serviceNames = new ArrayList<String>();
-    ArrayList<Object> serviceObjs = new ArrayList<Object>();
-    ArrayList<Hashtable<String, Object>> serviceProperties = new ArrayList<Hashtable<String, Object>>();
-    
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl() {}
-    
-    public OSGiBundleImpl(String[] references, String[] filters) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.references = references == null?new String[0] : references;
-        
-       
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            referenceFilters = new String[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-                
-                if (filters != null && filters.length > i)
-                    referenceFilters[i] = filters[i];
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started bundle " + name);
-    	
-    	this.bundleContext = bc;
-        
-        boolean useSingleRegisterService = serviceNames.size() > 1;
-        for (int i = 1; i < serviceNames.size(); i++) {
-            if (serviceObjs.get(i) != serviceObjs.get(0) || 
-                    serviceProperties.get(i) != serviceProperties.get(0)) {
-                useSingleRegisterService = false;
-                break;
-            }
-        }
-        if (useSingleRegisterService) {
-            bundleContext.registerService(serviceNames.toArray(new String[serviceNames.size()]), 
-                    serviceObjs.get(0), serviceProperties.get(0));
-        }
-        else {
-            for (int i = 0; i < serviceNames.size(); i++) {
-                bundleContext.registerService(serviceNames.get(i), serviceObjs.get(i), serviceProperties.get(i));
-            }
-        }
-        
-        started(bc);
-    	
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                if (referenceFields[i].get(this) != null)
-                    continue;
-                
-    	        ServiceReference[] refs = bundleContext.getServiceReferences(referenceClasses[i].getName(), referenceFilters[i]);
-	            if (refs != null && refs.length > 0) {
-                    Object obj = bundleContext.getService(refs[0]);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop bundle " + name);
-
-    }
-    
-    protected void started(BundleContext bc)  {
-        
-    }
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-    public void registerService(Object serviceObject, String serviceName, Hashtable<String, Object> props) {
-        serviceObjs.add(serviceObject);
-        serviceNames.add(serviceName);
-        serviceProperties.add(props == null? new Hashtable<String, Object>() : props);
-    }
-}
- 
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 2762bc62be..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.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 supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseBooks();
-    
-    public void purchaseGames();
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-    
-    public boolean hasOutstandingOrders();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 80346311b1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,88 +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 supplychain.customer;
-
-import java.util.ArrayList;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer1;
-	
-    private Retailer retailer2;
-    
-    private Retailer retailer3;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    @Reference
-    public void setRetailer1(Retailer retailer1) {
-        this.retailer1 = retailer1;
-    }
-    
-    @Reference
-    public void setRetailer2(Retailer retailer2) {
-        this.retailer2 = retailer2;
-    }
-    
-    @Reference
-    public void setRetailer3(Retailer retailer3) {
-        this.retailer3 = retailer3;
-    }
-    
-    public void purchaseBooks() {
-    	System.out.println("JavaCustomerComponentImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        retailer1.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("JavaCustomerComponentImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);       
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-    
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a879505610..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,106 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import org.osgi.service.component.ComponentContext;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    public OSGiCustomerComponentImpl() {
-        System.out.println("Created OSGiCustomerComponentImpl " + this);
-    }
-    
-    protected void setRetailer1(Retailer retailer1) {
-    	this.retailer1 = retailer1;
-    }
-    
-    protected void unsetRetailer1(Retailer retailer1) {
-    	// this.retailer1 = null;
-    }
-    
-    
-    protected void setRetailer2(Retailer retailer2) {
-    	this.retailer2 = retailer2;
-    }
-    
-    protected void unsetRetailer2(Retailer retailer2) {
-    	// this.retailer2 = null;
-    }
-    
-    protected void setRetailer3(Retailer retailer3) {
-        this.retailer3 = retailer3;
-    }
-    
-    protected void unsetRetailer3(Retailer retailer3) {
-        // this.retailer3 = null;
-    }
-    
-
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerComponentImpl.purchaseBooks, retailer1 is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        retailer1.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerComponentImpl.purchaseGames, retailer2 is " + retailer2);
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-    	System.out.println("OSGiCustomerComponentImpl.purchaseGames, retailer3 is " + retailer3);
-    	retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiCustomerComponentImpl bundle ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiCustomerComponentImpl bundle ");
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
deleted file mode 100644
index c8cb522cf4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ /dev/null
@@ -1,65 +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 supplychain.customer;
-
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerFactoryImpl implements BundleActivator, ServiceFactory {
-    
-    private BundleContext bundleContext;
-    
-    public OSGiCustomerFactoryImpl() {
-    }
-    
-    
-    public void start(BundleContext bc)  {
-        
-        this.bundleContext = bc;
-        bc.registerService(Customer.class.getName(), this, null);
-    }
-    
-    
-    
-   
-    public void stop(BundleContext context) throws Exception {
-        
-    }
-
-
-    public Object getService(Bundle bundle, ServiceRegistration registration) {
-        
-        OSGiCustomerImpl customer = new OSGiCustomerImpl(false);
-        customer.start(bundleContext);
-        return customer;
-        
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration registration, Object obj) {       
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 546971860e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,92 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-@AllowsPassByReference
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    
-    public OSGiCustomerImpl() {
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-        registerService(this, "supplychain.customer.Customer", null);
-                
-    }
-    
-    public OSGiCustomerImpl(boolean ignore) { // Used only to test service factories
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-               
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerImpl.purchaseBooks, retailer is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer1.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerImpl.purchaseGames, retailer is " + retailer2);
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
deleted file mode 100644
index 593e55f3f5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ /dev/null
@@ -1,100 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import org.osgi.service.component.ComponentContext;
-
-
-import supplychain.retailer.Retailer;
-import supplychain.retailer.RetailerQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerWithQueryComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    private RetailerQuery retailerQuery;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    public OSGiCustomerWithQueryComponentImpl() {
-        System.out.println("Created OSGiCustomerWithQueryComponentImpl " + this);
-    }
-    
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	// this.retailer = null;
-    }
-    
-    
-    protected void setRetailerQuery(RetailerQuery retailerQuery) {
-        this.retailerQuery = retailerQuery;
-    }
-    
-    protected void unsetRetailerQuery(RetailerQuery retailerQuery) {
-        // this.retailerQuery = null;
-    }
-    
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiCustomerWithQueryComponentImpl bundle ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiCustomerWithQueryComponentImpl bundle ");
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
deleted file mode 100644
index 18483817ad..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ /dev/null
@@ -1,82 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-import supplychain.retailer.RetailerQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerWithQueryImpl extends OSGiBundleImpl implements Customer {
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer;
-    private RetailerQuery retailerQuery;
-    
-    public OSGiCustomerWithQueryImpl() {
-        super(  new String[]{"retailer", "retailerQuery"},
-                new String[]{"(component.service.name=RetailerComponent/Retailer)",
-                             "(component.service.name=RetailerComponent/RetailerQuery)"
-                });
-        registerService(this, "supplychain.customer.Customer", null);
-                
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerWithQueryImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerWithQueryImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
deleted file mode 100644
index 5ba42780f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ /dev/null
@@ -1,30 +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 supplychain.customer;
-
-import org.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerComponentImpl extends OSGiCustomerComponentImpl {
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
deleted file mode 100644
index bc569d0ac0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ /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.    
- */
-package supplychain.customer;
-
-
-import org.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerImpl extends OSGiCustomerImpl {
-    
-    public OSGiStatelessCustomerImpl(boolean ignore) { 
-        super(ignore);
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
deleted file mode 100644
index 599ab51a50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ /dev/null
@@ -1,98 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiVersionedCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    private int version;
-    
-    public OSGiVersionedCustomerImpl() {
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-               
-    }
-    
-    protected void started(BundleContext bc)  {
-        
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        else version = 3;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("component.name", "CustomerComponent" + version);
-        bc.registerService("supplychain.customer.Customer", this, props1);
-               
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiVersionedCustomerImpl.purchaseBooks , retailer is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com v" + version + 
-                "), fulfilled, shipped (ParcelForce)");
-        
-        retailer1.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (play.com v" + version + 
-                "), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index df52c6c760..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,67 +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 supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component.
- */
-@Service(Retailer.class)
-@Scope("COMPOSITE")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    private String retailerName;
-    
-    public JavaRetailerComponentImpl() {
-    	System.out.println("Created RetailerComponentImpl");
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-    	System.out.println("retailer setWarehouse " + warehouse);
-    	
-        this.warehouse = warehouse;
-    }
-    
-    @Property
-    public void setRetailerName(String retailerName) {
-    	this.retailerName = retailerName;
-    }
-    
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("JavaRetailerComponentImpl.submitOrder " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-
-    
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index aca5943552..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,64 +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 supplychain.retailer;
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    private String retailerName;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	// this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiRetailerComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("retailerName");
-	    if (prop instanceof String[])
-	        retailerName = ((String [])prop)[0];
-        
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiRetailerComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e71c624f49..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ /dev/null
@@ -1,58 +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 supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component.
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl {
-    
-    protected Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super(new String[]{"warehouse"}, 
-                new String[]{"(component.service.name=WarehouseComponent1/Warehouse)"});
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        registerService(new OSGiRetailerServiceImpl(this, "amazon.com"),
-                "supplychain.retailer.Retailer", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("retailerName", "play.com");
-        registerService(
-                new OSGiRetailerServiceImpl(this, "play.com"),
-                "supplychain.retailer.Retailer", props2);
-        
-        Hashtable<String, Object> props3 = new Hashtable<String, Object>();
-        props3.put("retailerName", "ebay.com");
-        registerService(
-                new OSGiRetailerServiceImpl(this, "ebay.com"),
-                "supplychain.retailer.Retailer", props3);
-    }
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
deleted file mode 100644
index a036ecfc76..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.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 supplychain.retailer;
-
-
-/**
- * This class implements the Retailer service.
- */
-public class OSGiRetailerServiceImpl implements Retailer {
-
-    private OSGiRetailerImpl retailerImpl;
-
-    private String retailerName;
-
-    OSGiRetailerServiceImpl(OSGiRetailerImpl retailerImpl, String retailerName) {
-        this.retailerImpl = retailerImpl;
-        this.retailerName = retailerName;
-        
-    }
-
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse);
-        retailerImpl.warehouse.fulfillOrder(order + ", submitted ("
-                + retailerName + ")");
-
-    }
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
deleted file mode 100644
index db877bb366..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ /dev/null
@@ -1,78 +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 supplychain.retailer;
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.warehouse.Warehouse;
-import supplychain.warehouse.WarehouseQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiRetailerWithQueryComponentImpl implements Retailer, RetailerQuery {
-    
-    private Warehouse warehouse;
-    private WarehouseQuery warehouseQuery;
-    private String retailerName;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	// this.warehouse = null;
-    }
-    
-    protected void setWarehouseQuery(WarehouseQuery warehouseQuery) {
-        this.warehouseQuery = warehouseQuery;
-    }
-    
-    protected void unsetWarehouseQuery(WarehouseQuery warehouse) {
-        // this.warehouseQuery = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-    
-    public boolean isAvailable(String order) {
-        return warehouseQuery.isAvailable(order);
-    }
-
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiRetailerComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("retailerName");
-	    if (prop instanceof String[])
-	        retailerName = ((String [])prop)[0];
-        
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiRetailerComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
deleted file mode 100644
index ee1f575e70..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ /dev/null
@@ -1,64 +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 supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-import supplychain.warehouse.WarehouseQuery;
-
-/**
- * This class implements the Retailer service component with query.
- */
-public class OSGiRetailerWithQueryImpl extends OSGiBundleImpl implements Retailer, RetailerQuery {
-    
-    private Warehouse warehouse;
-    private WarehouseQuery warehouseQuery;
-    
-    public OSGiRetailerWithQueryImpl() {
-
-        super(new String[]{"warehouse", "warehouseQuery"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        registerService(this,
-                "supplychain.retailer.Retailer", props1);
-        
-        registerService(this,
-                "supplychain.retailer.RetailerQuery", props1);
-        
-    }
-    
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted ("
-                + "amazon.com" + ")");
-
-    }
-
-    public boolean isAvailable(String order) {
-        return warehouseQuery.isAvailable(order);
-    }
-
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
deleted file mode 100644
index 09e60ca626..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ /dev/null
@@ -1,75 +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 supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component.
- */
-public class OSGiVersionedRetailerImpl extends OSGiBundleImpl {
-    
-    protected Warehouse warehouse;
-    
-    private int version;
-    
-    public OSGiVersionedRetailerImpl() {
-
-        super(new String[]{"warehouse"}, null);
-        
-        
-    }
-    
-    protected void started(BundleContext bc)  {
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        else version = 3;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        bc.registerService("supplychain.retailer.Retailer", 
-                new OSGiVersionedRetailerServiceImpl(this, "amazon.com", version),
-                props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("retailerName", "play.com");
-        bc.registerService(
-                "supplychain.retailer.Retailer", 
-                new OSGiVersionedRetailerServiceImpl(this, "play.com", version),
-                props2);
-        
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Warehouse.class.getName(), 
-                    "(component.service.name=WarehouseComponent" + version + "/Warehouse)");
-            if (refs != null && refs.length > 0) {
-                warehouse = (Warehouse) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
deleted file mode 100644
index 7dd70889c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.retailer;
-
-
-/**
- * This class implements the Retailer service.
- */
-public class OSGiVersionedRetailerServiceImpl implements Retailer {
-
-    private OSGiVersionedRetailerImpl retailerImpl;
-
-    private String retailerName;
-    
-    private int version;
-
-    OSGiVersionedRetailerServiceImpl(OSGiVersionedRetailerImpl retailerImpl, String retailerName, int version) {
-        this.retailerImpl = retailerImpl;
-        this.retailerName = retailerName;
-        this.version = version;
-    }
-
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse);
-        retailerImpl.warehouse.fulfillOrder(order + ", submitted ("
-                + retailerName + " v" + version + ")");
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
deleted file mode 100644
index 354f40a064..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.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 supplychain.retailer;
-
-/**
- * This is the business interface of the RetailerQuery service.
- */
-public interface RetailerQuery {
-    
-    public boolean isAvailable(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index d0cf43a960..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,58 +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 supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    private String shipperName;
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    @Property
-    public void setShipperName(String shipperName) {
-        this.shipperName = shipperName;
-    }
-    
-    
-    
-    public void processShipment(String order) {
-    	System.out.println("JavaShipperComponentImpl.processShipment");
-        customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index ff40a7ae36..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ /dev/null
@@ -1,62 +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 supplychain.shipper;
-
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    private String shipperName;
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	// this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-    	System.out.println("OSGiShipperComponentImpl.processShipment, customer is " + customer);
-        customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-    }
-    
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiShipperComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("shipperName");
-	    if (prop instanceof String[])
-	    	shipperName = ((String [])prop)[0];
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiShipperComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
deleted file mode 100644
index ef989d6fcf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ /dev/null
@@ -1,78 +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 supplychain.shipper;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperFactoryImpl implements BundleActivator, ServiceFactory {
-    
-    private BundleContext bundleContext;
-    
-    public OSGiShipperFactoryImpl() {
-
-    }
-    
-
-    public void start(BundleContext bc)  {
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        bc.registerService(Shipper.class.getName(), this, props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        bc.registerService(Shipper.class.getName(), this, props2);
-    }
-    
-    
-    
-   
-    public void stop(BundleContext context) throws Exception {
-        
-    }
-
-    
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-        OSGiShipperImpl shipper = new OSGiShipperImpl(false);
-        shipper.start(bundleContext);
-        OSGiStatelessShipperServiceImpl shipperService = new OSGiStatelessShipperServiceImpl(shipper, 
-                (String)reg.getReference().getProperty("shipperName"));
-        return shipperService;
-    }
-
-    public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) {
-        
-    }
-    
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index effae8c246..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.shipper;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperImpl extends OSGiBundleImpl {
-    
-    protected Customer customer;
-
-    
-    public OSGiShipperImpl() {
-
-        super(new String[]{"customer"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        registerService(new OSGiShipperServiceImpl(this, "RoyalMail"),
-                "supplychain.shipper.Shipper", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        registerService(
-                new OSGiShipperServiceImpl(this, "ParcelForce"),
-                "supplychain.shipper.Shipper", props2);
-    }
-    
-    // Used only by service factories
-    public OSGiShipperImpl(boolean ignore) {
-
-        super(new String[]{"customer"}, null);
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
deleted file mode 100644
index 4effadf208..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ /dev/null
@@ -1,43 +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 supplychain.shipper;
-
-
-/**
- * This class implements the Shipper service.
- */
-public class OSGiShipperServiceImpl implements Shipper {
-
-    private OSGiShipperImpl shipperImpl;
-
-    private String shipperName;
-
-    OSGiShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) {
-        this.shipperImpl = shipperImpl;
-        this.shipperName = shipperName;
-    }
-
-    public void processShipment(String order) {
-
-        System.out.println("Shipper.submitOrder, warehouse is " + shipperImpl.customer);
-        shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
deleted file mode 100644
index 13bce67bb4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ /dev/null
@@ -1,30 +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 supplychain.shipper;
-
-import org.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Shipper service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperComponentImpl extends OSGiShipperComponentImpl {
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
deleted file mode 100644
index 071a131f40..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ /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.    
- */
-package supplychain.shipper;
-
-import org.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Shipper service.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperServiceImpl extends OSGiShipperServiceImpl {
-
-    public OSGiStatelessShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) {
-       super(shipperImpl, shipperName);
-    }
-
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
deleted file mode 100644
index 6ebd1f2894..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ /dev/null
@@ -1,78 +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 supplychain.shipper;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiVersionedShipperImpl extends OSGiBundleImpl {
-    
-    protected Customer customer;
-    
-    private int version;
-
-    
-    public OSGiVersionedShipperImpl() {
-
-        super(new String[]{"customer"}, null);
-    }
-    
-    protected void started(BundleContext bc) {
-        
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        props1.put("component.service.name", "ShipperComponent"+version+"/ShipperService1");
-        bc.registerService("supplychain.shipper.Shipper", 
-                new OSGiVersionedShipperServiceImpl(this, "RoyalMail", version),
-                props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        props2.put("component.service.name", "ShipperComponent"+version+"/ShipperService2");
-        bc.registerService("supplychain.shipper.Shipper", 
-                new OSGiVersionedShipperServiceImpl(this, "ParcelForce", version),
-                props2);
-        
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Customer.class.getName(), 
-                    "(component.service.name=CustomerComponent" + version + "/CustomerService)");
-            if (refs != null && refs.length > 0) {
-                customer = (Customer) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
deleted file mode 100644
index b66961b1c2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.shipper;
-
-
-/**
- * This class implements the Shipper service.
- */
-public class OSGiVersionedShipperServiceImpl implements Shipper {
-
-    private OSGiVersionedShipperImpl shipperImpl;
-
-    private String shipperName;
-    
-    private int version;
-
-    OSGiVersionedShipperServiceImpl(OSGiVersionedShipperImpl shipperImpl, String shipperName, int version) {
-        this.shipperImpl = shipperImpl;
-        this.shipperName = shipperName;
-        this.version = version;
-    }
-
-    public void processShipment(String order) {
-
-        System.out.println("Shipper.processShipment, version " + version + " customer is " + shipperImpl.customer);
-        shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 9edf3567e5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.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 supplychain.warehouse;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
deleted file mode 100644
index 659f16be7f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ /dev/null
@@ -1,52 +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 supplychain.warehouse;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-@Service(interfaces={Warehouse.class, WarehouseQuery.class})
-@Scope("COMPOSITE")
-public class JavaWarehouseWithQueryComponentImpl implements Warehouse, WarehouseQuery {
-    
-    private Shipper shipper;
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    }
-
-    public boolean isAvailable(String order) {
-        return true;
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 7c9e102fd2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.warehouse;
-
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	// this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("OSGiWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiWarehouseComponentImpl ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiWarehouseComponentImpl ");
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index bb04ff42e0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ /dev/null
@@ -1,68 +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 supplychain.warehouse;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    protected Shipper shipper;
-    private OSGiWarehouseServiceImpl warehouseService1;
-    private OSGiWarehouseServiceImpl warehouseService2;
-    
-    public OSGiWarehouseImpl() {
-    	super(new String[]{"shipper"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("component.name", "WarehouseComponent1");
-        warehouseService1 = new OSGiWarehouseServiceImpl(this, 2);
-        registerService(warehouseService1,
-                "supplychain.warehouse.Warehouse", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("component.name", "WarehouseComponent2");
-        warehouseService2 = new OSGiWarehouseServiceImpl(this, 1);
-        registerService(warehouseService2,
-                "supplychain.warehouse.Warehouse", props2);
-    }
-    
-    protected void started(BundleContext bc) {
-        warehouseService1.started(bc);
-        warehouseService2.started(bc);
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + shipper);
-        	
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
deleted file mode 100644
index 3317816557..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ /dev/null
@@ -1,62 +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 supplychain.warehouse;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.shipper.Shipper;
-
-
-/**
- * This class implements the Warehouse service.
- */
-public class OSGiWarehouseServiceImpl implements Warehouse {
-
-    private OSGiWarehouseImpl warehouseImpl;
-    private Shipper shipper;
-    private int shipperNum;
-
-
-    OSGiWarehouseServiceImpl(OSGiWarehouseImpl warehouseImpl, int shipperNum) {
-        this.warehouseImpl = warehouseImpl;
-        this.shipperNum = shipperNum;
-    }
-    
-    
-    protected void started(BundleContext bc) {
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Shipper.class.getName(), 
-                    "(component.service.name=ShipperComponent" + shipperNum + "/Shipper)");
-            if (refs != null && refs.length > 0) {
-                shipper = (Shipper) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-
-    public void fulfillOrder(String order) {
-        System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + warehouseImpl.shipper);
-            
-        shipper.processShipment(order + ", fulfilled");
-        
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
deleted file mode 100644
index 6d1ad76796..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.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 supplychain.warehouse;
-
-/**
- * This is the business interface of the RetailerQuery service.
- */
-public interface WarehouseQuery {
-    
-    public boolean isAvailable(String order);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
deleted file mode 100644
index 71e248590b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ /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.    

--->

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

-    <service name="CallbackClient">

-        <interface.java interface="callback.client.CallbackClient"/>

-    </service>

-    

-    

-    <reference name="callbackService" >

-        <interface.java interface="callback.service.CallbackService" 

-                        callbackInterface="callback.client.CallbackCallback" />

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
deleted file mode 100644
index 7c1125bbb5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ /dev/null
@@ -1,27 +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.    

--->

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

-    <service name="CallbackService">

-        <interface.java interface="callback.service.CallbackService" 

-                        callbackInterface="callback.client.CallbackCallback"/>

-    </service>

-    

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
deleted file mode 100644
index 8456b878f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test1.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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

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

-            bundleSymbolicName="callback.CallbackClient">

-            

-            <properties referenceCallback="callbackService">

-               <property name="component.name">CallbackClient</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-    <component name="CallbackService">

-      <implementation.java class="callback.service.JavaCallbackServiceImpl"/>

-    </component>  

-  

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
deleted file mode 100644
index d5a47c6403..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ /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.

--->

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

-    targetNamespace="http://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.java class="callback.client.JavaCallbackClientImpl"/>

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-   

-    <component name="CallbackService">

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

-            bundleSymbolicName="callback.CallbackService"

-        >

-        <properties serviceCallback="CallbackService">

-            <property name="component.name">CallbackClient</property>

-        </properties>

-        

-        </implementation.osgi >   

-    </component> 

-  

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
deleted file mode 100644
index e6391d2159..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ /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.

--->

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

-    targetNamespace="http://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

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

-            bundleSymbolicName="callback.CallbackClient"

-        />

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-   

-    <component name="CallbackService">

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

-            bundleSymbolicName="callback.CallbackService"

-        />

-    </component> 

-  

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
deleted file mode 100644
index c79ede815b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ /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.    

--->

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

-

-    <service name="ConversationalClient">

-        <interface.java interface="conversation.client.ConversationalClient"/>

-    </service>

-    

-    

-    <reference name="conversationalReferenceClient" >

-        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient" />

-    </reference>

-    

-    <reference name="conversationalService" >

-        <interface.java interface="conversation.service.ConversationalService" 

-                        callbackInterface="conversation.client.ConversationalCallback" />

-    </reference>

-    

-   

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
deleted file mode 100644
index 04cc73b85c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-

-    

-    <service name="ConversationalReferenceClient">

-        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient"/>

-    </service>

-    

-   

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
deleted file mode 100644
index 9ece700efe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ /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.    

--->

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

-

-    <service name="ConversationalService">

-        <interface.java interface="conversation.service.ConversationalService"

-                        callbackInterface="conversation.client.ConversationalCallback" />

-    </service>

-    

-   

-    

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
deleted file mode 100644
index 52bc43478d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ /dev/null
@@ -1,162 +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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://conversations"

-    name="ConversationalITest">

-           

-    <component name="ConversationalStatelessClientStatelessService">

-        <!-- <implementation.java class="conversation.ConversationalClientStatelessImpl"/> -->

-        

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

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatelessImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatelessClientStatelessService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatelessClientStatelessService</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>        

-        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalStatelessClientStatefulService">

-        <!--<implementation.java class="conversation.ConversationalClientStatelessImpl"/>-->

-        

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

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatelessImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatelessClientStatefulService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatelessClientStatefulService</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>

-    </component>     

-    

-    <component name="ConversationalStatefulClientStatelessService">

-        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->

-        

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

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatefulImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatefulClientStatelessService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatefulClientStatelessService</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalStatefulClientStatefulService">

-        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->

-        

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

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatefulImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatefulClientStatefulService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatefulClientStatefulService</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalReferenceClient">

-        <!--<implementation.java class="conversation.ConversationalReferenceClientImpl"/>-->

-        

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

-            bundleSymbolicName="conversation.ConversationalReferenceClient"

-            classes="conversation.referenceclient.ConversationalReferenceClientImpl"

-        />

-        

-    </component>    

-        

-    <component name="ConversationalServiceStateful">

-        <!--<implementation.java class="conversation.ConversationalServiceStatefulImpl"/>-->

-        

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

-            bundleSymbolicName="conversation.ConversationalService"

-            classes="conversation.service.ConversationalServiceStatefulImpl">

-            

-            <properties service="ConversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-        </implementation.osgi>

-        

-    </component>       

-   

-    <component name="ConversationalServiceStateless">

-        <!--<implementation.java class="conversation.ConversationalServiceStatelessImpl"/>-->

-        

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

-            bundleSymbolicName="conversation.ConversationalService"

-            classes="conversation.service.ConversationalServiceStatelessImpl">

-            

-            <properties service="ConversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-        </implementation.osgi>

-        

-    </component> 

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ /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.    

--->

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

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ /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.    

--->

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

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ /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.    

--->

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

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ /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.    

--->

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

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ /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.    

--->

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

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ /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.    

--->

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

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
deleted file mode 100644
index 0b8d2e5851..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ /dev/null
@@ -1,130 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="ds.factory.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiStatelessCustomerComponentImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

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

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

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

-            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

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

-            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
deleted file mode 100644
index 87370a6df4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ /dev/null
@@ -1,116 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="factory.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiStatelessCustomerImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="factory.supplychain.retailer.Retailer">

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

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

-                bundleSymbolicName="factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

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

-            bundleSymbolicName="factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperServiceImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-    </component>

-    

-     

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
deleted file mode 100644
index 127349eacf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ /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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="Greetings">
-        <interface.java interface="helloworld.Greetings"/>
-    </service>
-    
-    
-    <reference name="greetingsService" >
-        <interface.java interface="helloworld.Greetings" />
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
deleted file mode 100644
index 7e3810c458..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ /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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="OSGiHelloWorld">
-        <interface.java interface="helloworld.HelloWorld"/>
-    </service>
-    
-    
-    <reference name="helloWorldWS" >
-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->
-        <interface.java interface="helloworld.ws.HelloWorld" />
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ /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.    

--->

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

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailerQuery">

-            <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ /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.    

--->

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

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerQuery">

-        <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <reference name="warehouseQuery">

-            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ /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.    

--->

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

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ /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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    <service name="WarehouseQuery">

-        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ /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.    

--->

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

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailerQuery">

-            <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ /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.    

--->

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

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerQuery">

-        <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <reference name="warehouseQuery">

-            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ /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.    

--->

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

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ /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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    <service name="WarehouseQuery">

-        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
deleted file mode 100644
index 5172cbe21e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ /dev/null
@@ -1,57 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-    

-    <component name="CustomerComponent">

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

-            bundleSymbolicName="ds.interfaces.supplychain.customer.Customer"

-        />

-        <reference name="retailer" target="RetailerComponent/Retailer"/>

-        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>

-        

-    </component>

-

-    <component name="RetailerComponent">

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

-            bundleSymbolicName="ds.interfaces.supplychain.retailer.Retailer"

-        />

-        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>

-        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />

-       

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

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

-            bundleSymbolicName="ds.interfaces.supplychain.shipper.Shipper"

-        />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-   

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
deleted file mode 100644
index b7591e732d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ /dev/null
@@ -1,57 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-    

-    <component name="CustomerComponent">

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

-            bundleSymbolicName="interfaces.supplychain.customer.Customer"

-        />

-        <reference name="retailer" target="RetailerComponent/Retailer"/>

-        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>

-        

-    </component>

-

-    <component name="RetailerComponent">

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

-            bundleSymbolicName="interfaces.supplychain.retailer.Retailer"

-        />

-        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>

-        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />

-       

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

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

-            bundleSymbolicName="interfaces.supplychain.shipper.Shipper"

-        />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-   

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
deleted file mode 100644
index cf8717fcf5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: CallbackClient

-Bundle-SymbolicName: callback.CallbackClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, callback.service

-Export-Package: callback.client

-Bundle-Activator: callback.client.OSGiCallbackClientImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
deleted file mode 100644
index 785212fa6d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: CallbackService

-Bundle-SymbolicName: callback.CallbackService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, callback.client

-Export-Package: callback.service

-Bundle-Activator: callback.service.OSGiCallbackServiceImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
deleted file mode 100644
index 7a06030e32..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,

-                conversation.service, conversation.referenceclient

-Export-Package: conversation.client

-Bundle-Activator: conversation.client.ConversationalClientActivator

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
deleted file mode 100644
index 5c39b53b0a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalReferenceClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,

-                conversation.service

-Export-Package: conversation.referenceclient

-Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
deleted file mode 100644
index b8bb809319..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,

-                conversation.client

-Export-Package: conversation.service

-Bundle-Activator: conversation.service.ConversationalServiceActivator

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
deleted file mode 100644
index 26f32fe617..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: factory.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerFactoryImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
deleted file mode 100644
index 1b9e0e847e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: factory.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
deleted file mode 100644
index 6066a38f29..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: factory.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperFactoryImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
deleted file mode 100644
index 777edd3f7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.factory.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/factory/ds/Customer.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
deleted file mode 100644
index d8adaa2ba3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.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.    
--->
-<component name="CustomerComponent" >
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service servicefactory="true" >
-         <provide interface="supplychain.customer.Customer" />
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
deleted file mode 100644
index e0bd9d8c10..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.factory.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/factory/ds/Retailer1.xml, osgi/factory/ds/Retailer2.xml 

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
deleted file mode 100644
index 6005ae785c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ /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.    
--->
-<component name="RetailerComponent1"  >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
deleted file mode 100644
index 6f0b79ebc2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ /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.    
--->
-<component name="RetailerComponent2" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
deleted file mode 100644
index d4b461460e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.factory.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/factory/ds/Shipper1.xml, osgi/factory/ds/Shipper2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
deleted file mode 100644
index bb15e6e3aa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ /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.    
--->
-<component name="ShipperComponent1"  >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
deleted file mode 100644
index 7591201b8c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ /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.    
--->
-<component name="ShipperComponent2">
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
deleted file mode 100644
index 0e844fab99..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.factory.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/factory/ds/Warehouse.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ /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.    
--->
-<component name="WarehouseComponent"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
deleted file mode 100644
index a8a87c5c8c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: interfaces.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerWithQueryImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
deleted file mode 100644
index 05bbf4db88..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: interfaces.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerWithQueryImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
deleted file mode 100644
index a12d1a21ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: interfaces.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
deleted file mode 100644
index 2214db11a6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.interfaces.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/interfaces/ds/Customer.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
deleted file mode 100644
index 8d44067992..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.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.    
---> 
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerWithQueryComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer"
-        unbind="unsetRetailer"
-        target="(component.service.name=RetailerComponent/Retailer)"
-        policy="dynamic"
-    />
-    
-    <reference 
-        name="retailerQuery"
-        interface="supplychain.retailer.RetailerQuery" 
-        bind="setRetailerQuery"
-        unbind="unsetRetailerQuery"
-        target="(component.service.name=RetailerComponent/RetailerQuery)"
-        policy="dynamic"
-    />
-    
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
deleted file mode 100644
index 60c0fb3fd3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.interfaces.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/interfaces/ds/Retailer.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
deleted file mode 100644
index ca1392d2b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ /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.    
--->
-<component name="RetailerComponent" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerWithQueryComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-         <provide interface="supplychain.retailer.RetailerQuery"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <reference 
-        name="supplychain.warehouse.WarehouseQuery" 
-        interface="supplychain.warehouse.WarehouseQuery" 
-        bind="setWarehouseQuery"
-        unbind="unsetWarehouseQuery"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
deleted file mode 100644
index 7c9f67c36d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.interfaces.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/interfaces/ds/Shipper.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
deleted file mode 100644
index 760c761666..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ /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.    
--->
-<component name="ShipperComponent"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
deleted file mode 100644
index 7d56770311..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Greetings

-Bundle-SymbolicName: passbyref.helloworld.Greetings

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: helloworld

-Bundle-Activator: helloworld.OSGiGreetingsImpl

-

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
deleted file mode 100644
index 321bdc713f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.ManagedStockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiManagedStockQuoteFactoryImpl

-

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
deleted file mode 100644
index 66f98011cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.StockQuote

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiStockQuoteImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
deleted file mode 100644
index 6874a66db9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.StockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiStockQuoteFactoryImpl

-

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
deleted file mode 100644
index 47d290eb1a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: ds.stockquote.StockQuote

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm

-Export-Package: stockquote

-Service-Component: osgi/properties/ds/StockQuote.xml

-

-

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
deleted file mode 100644
index c7f13a50a7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<component name="StockQuoteComponent" immediate="true">
-    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
-    <service>
-         <provide interface="stockquote.StockQuote"/>
-    </service>
-    <property name="currency">GBP</property>
-    <property name="exchangeRate" type="Double">1.0</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
deleted file mode 100644
index f4c102c4f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: ds.stockquote.StockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm

-Export-Package: stockquote

-Service-Component: osgi/properties/ds/StockQuoteFactory.xml

-

-

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
deleted file mode 100644
index cbebf7eec2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<component name="StockQuoteComponent" >
-    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
-    <service servicefactory="true" >
-         <provide interface="stockquote.StockQuote" />
-    </service>
-    <property name="currency">GBP</property>
-    <property name="exchangeRate" type="Double">1.0</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
deleted file mode 100644
index 6a3c845cca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorldClient

-Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, 

- org.osoa.sca, org.osoa.sca.annotations,

- commonj.sdo, commonj.sdo.helper, 

- org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl,

- helloworld.sdo

-Export-Package: helloworld.sdo.client

-Service-Component: osgi/sdo/ds/HelloWorldClient.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
deleted file mode 100644
index cb6345432f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.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.    
--->
-<component name="HelloWorldClientComponent" immediate="true">
-    <implementation class="helloworld.sdo.client.HelloWorldClientComponent" />
-    <service>
-         <provide interface="helloworld.sdo.client.HelloWorldClient"/>
-    </service>
-    <reference 
-        name="helloWorldService"
-        interface="helloworld.sdo.HelloWorldService" 
-        bind="setHelloWorldService"
-        unbind="unsetHelloWorldService"
-        target="(component.service.name=JavaHelloWorldServiceComponent/HelloWorldService)"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
deleted file mode 100644
index 89871fa8f6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorldService

-Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component,

- org.osoa.sca, org.osoa.sca.annotations,

- commonj.sdo, commonj.sdo.helper, 

- org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl

-Export-Package: helloworld.sdo

-Service-Component: osgi/sdo/ds/HelloWorldService.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
deleted file mode 100644
index d968d1ffc5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.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.    
--->
-<component name="HelloWorldServiceComponent" immediate="true">
-    <implementation class="helloworld.sdo.HelloWorldServiceComponent" />
-    <service>
-         <provide interface="helloworld.sdo.HelloWorldService"/>
-    </service>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
deleted file mode 100644
index fc762df8d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: services.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
deleted file mode 100644
index 02e42bc010..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: services.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
deleted file mode 100644
index 390367b99b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: services.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
deleted file mode 100644
index 4715cbd976..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: services.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
deleted file mode 100644
index 932fb8a483..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.services.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/services/ds/Customer.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.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.    
--->
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
deleted file mode 100644
index c799f31606..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.services.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/services/ds/Retailer1.xml, osgi/services/ds/Retailer2.xml 

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
deleted file mode 100644
index db68d7e333..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ /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.    
--->
-<component name="RetailerComponent1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
deleted file mode 100644
index 1aea3cf669..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ /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.    
--->
-<component name="RetailerComponent2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
deleted file mode 100644
index 106bd1b6aa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.services.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/services/ds/Shipper1.xml, osgi/services/ds/Shipper2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
deleted file mode 100644
index 1e3c915a59..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ /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.    
--->
-<component name="ShipperComponent1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ /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.    
--->
-<component name="ShipperComponent2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
deleted file mode 100644
index 81c51e6804..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.services.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/services/ds/Warehouse1.xml, osgi/services/ds/Warehouse2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ /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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ /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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
deleted file mode 100644
index 335bc419c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: version.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
deleted file mode 100644
index a68b9d6dbb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: version.supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
deleted file mode 100644
index 02f79c15f3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: version.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="1.0.0"

-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
deleted file mode 100644
index 8428b08d96..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: version.supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="2.0.0"

-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
deleted file mode 100644
index c81bf00d00..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: version.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
deleted file mode 100644
index 61c161617c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: version.supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
deleted file mode 100644
index fd6a26a65f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
deleted file mode 100644
index 0168bc2435..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper;version="2.0.0"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
deleted file mode 100644
index 6674cdd7f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.version.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Service-Component: osgi/version/ds/CustomerV1.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
deleted file mode 100644
index 72df35ef41..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.version.supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Service-Component: osgi/version/ds/CustomerV2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
deleted file mode 100644
index 724c8132df..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.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.    
--->
-<component name="CustomerComponent1" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
deleted file mode 100644
index 1e5035d949..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.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.    
--->
-<component name="CustomerComponent2" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
deleted file mode 100644
index 85bfd86422..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="1.0.0"

-Service-Component: osgi/version/ds/Retailer1V1.xml, osgi/version/ds/Retailer2V1.xml 

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
deleted file mode 100644
index 6e51b3d6f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ /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.    
--->
-<component name="RetailerComponent1.Retailer1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-    <property name="version">1</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
deleted file mode 100644
index 9a87758ec2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ /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.    
--->
-<component name="RetailerComponent2.Retailer1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent2/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-    <property name="version">2</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
deleted file mode 100644
index e134bd1061..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="2.0.0"

-Service-Component: osgi/version/ds/Retailer1V2.xml, osgi/version/ds/Retailer2V2.xml 

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
deleted file mode 100644
index c19895bab1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.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.    
--->
-<component name="RetailerComponent1.Retailer2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
deleted file mode 100644
index 707609d2c4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.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.    
--->
-<component name="RetailerComponent2.Retailer2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent2/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
deleted file mode 100644
index e084e5831a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Service-Component: osgi/version/ds/Shipper1V1.xml, osgi/version/ds/Shipper2V1.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
deleted file mode 100644
index d96f6481fb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ /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.    
--->
-<component name="ShipperComponent1.ShipperService1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent1)"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
deleted file mode 100644
index 10ef690c9b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ /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.    
--->
-<component name="ShipperComponent2.ShipperService1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent2)"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
deleted file mode 100644
index 003f9dca5a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Service-Component: osgi/version/ds/Shipper1V2.xml, osgi/version/ds/Shipper2V2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
deleted file mode 100644
index fefdea106d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ /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.    
--->
-<component name="ShipperComponent1.ShipperService2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent1)"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
deleted file mode 100644
index f6b847ed59..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ /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.    
--->
-<component name="ShipperComponent2.ShipperService2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent2)"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
deleted file mode 100644
index 5cff2f573e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ /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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ /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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
deleted file mode 100644
index 0fec68a725..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ /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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ /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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
deleted file mode 100644
index 678014d48d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: wiring.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
deleted file mode 100644
index f0090fb52b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: wiring.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
deleted file mode 100644
index 0b50923a05..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: wiring.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
deleted file mode 100644
index 1000a5f974..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: wiring.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
deleted file mode 100644
index 4e392a9ff1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.wiring.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/wiring/ds/Customer.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.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.    
--->
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
deleted file mode 100644
index 788ec4f19a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.wiring.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/wiring/ds/Retailer1.xml, osgi/wiring/ds/Retailer2.xml 

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
deleted file mode 100644
index 1ba16d0693..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.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.    
--->
-<component name="RetailerComponent1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
deleted file mode 100644
index a55ebd02a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.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.    
--->
-<component name="RetailerComponent2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
deleted file mode 100644
index e7459360e6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.wiring.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/wiring/ds/Shipper1.xml, osgi/wiring/ds/Shipper2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
deleted file mode 100644
index d518ecab62..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ /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.    
--->
-<component name="ShipperComponent1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        target="(component.service.name=CustomerComponent/Customer)"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ /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.    
--->
-<component name="ShipperComponent2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
deleted file mode 100644
index 880304187b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.wiring.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/wiring/ds/Warehouse1.xml, osgi/wiring/ds/Warehouse2.xml

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
deleted file mode 100644
index d72db04425..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-        target="(shipperName=ParcelForce)"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
deleted file mode 100644
index f9c1218f82..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-        target="(shipperName=RoyalMail)"
-    />
-</component>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
deleted file mode 100644
index d8e4c1cb7e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorld

-Bundle-SymbolicName: helloworld.HelloWorld

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component ,

- helloworld.ws

-Export-Package: helloworld

-Bundle-Activator: helloworld.OSGiHelloWorldImpl

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
deleted file mode 100644
index a6de268bf6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ /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.    

--->

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

-    <service name="Greetings">

-        <interface.java interface="helloworld.Greetings"/>

-    </service>

-    

-    

-    <reference name="greetingsService" >

-        <interface.java interface="helloworld.Greetings" />

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
deleted file mode 100644
index 660e277693..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.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://www.osoa.org/xmlns/sca/1.0"

-           name="HelloWorld">

-

-    <component name="JavaGreetingsComponent">

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

-        

-        <reference name="greetingsService" target="OSGiGreetingsComponent" />

-    </component>

-

-    <component name="OSGiGreetingsComponent">

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

-            bundleSymbolicName="passbyref.helloworld.Greetings"

-            classes="helloworld.OSGiGreetingsImpl"

-        />

-        <reference name="greetingsService" target="JavaGreetingsComponent" />

-    </component>

-

-    

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
deleted file mode 100644
index 02ae93aec2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.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://www.osoa.org/xmlns/sca/1.0" 

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

-           name="StockQuoteComposite">

-

-    <component name="StockQuoteComponent">

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

-            bundleSymbolicName="ds.stockquote.StockQuote"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
deleted file mode 100644
index c94504f07d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ /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.    

--->

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

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

-           name="StockQuoteComposite">

-

-    <component name="USDStockQuoteComponent">

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

-            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-    

-     <component name="EUROStockQuoteComponent">

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

-            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >EURO</property> 

-        <property name="exchangeRate" type="xsd:double" >1.48</property> 

-            

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
deleted file mode 100644
index fea03404fd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/properties-test.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://www.osoa.org/xmlns/sca/1.0" 

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

-           name="StockQuoteComposite">

-

-    <component name="StockQuoteComponent">

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

-            bundleSymbolicName="stockquote.StockQuote"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
deleted file mode 100644
index 3c425fcbc9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

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

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

-           name="StockQuoteComposite">

-

-    <component name="USDStockQuoteComponent">

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

-            bundleSymbolicName="stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-        </implementation.osgi>

-       

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-    

-    <component name="EUROStockQuoteComponent">

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

-            bundleSymbolicName="stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-        </implementation.osgi>

-        

-        

-        <property name="currency" type="xsd:string" >EURO</property> 

-        <property name="exchangeRate" type="xsd:double" >1.48</property> 

-            

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
deleted file mode 100644
index f6c04de980..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ /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.    

--->

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

-    

-    <service name="HelloWorldClient">

-        <interface.java interface="helloworld.sdo.client.HelloWorldClient"/>

-    </service>

-        

-    <reference name="helloWorldService" >

-        <interface.java interface="helloworld.sdo.HelloWorldService" />

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
deleted file mode 100644
index 87918132e6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ /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.    

--->

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

-    <service name="HelloWorldService">

-        <interface.java interface="helloworld.sdo.HelloWorldService"/>

-    </service>

-    

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
deleted file mode 100644
index 9b00787162..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld">
-   <deployable composite="helloworld:helloworldsdo"/>
-   
-   <import.java package="helloworld.sdo"/>
-</contribution>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ /dev/null
@@ -1,88 +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://helloworld" xmlns:tns="http://helloworld"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"

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

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="tns:Name" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <complexType name="Name">

-                <sequence>

-                    <element name="first" type="xsd:string" />

-                    <element name="last" type="xsd:string" />

-                </sequence>

-            </complexType>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="getGreetingsRequest">

-                <wsdlsoap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

-                <wsdlsoap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
deleted file mode 100644
index af79dc4bdf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ /dev/null
@@ -1,47 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://helloworld"

-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

-    name="helloworldsdo">

-    

-    <component name="JavaHelloWorldServiceComponent">

-        <implementation.java class="helloworld.sdo.HelloWorldServiceComponent" />

-    </component>

-    

-    <component name="JavaHelloWorldClientComponent">

-        <implementation.java class="helloworld.sdo.client.HelloWorldClientComponent" />

-        <reference name="helloWorldService" target="OSGiHelloWorldServiceComponent" />

-    </component>

-    

-    <component name="OSGiHelloWorldServiceComponent">       

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

-            bundleSymbolicName="ds.helloworld.sdo.HelloWorldService"

-        />

-    </component>

-    

-    <component name="OSGiHelloWorldClientComponent">       

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

-            bundleSymbolicName="ds.helloworld.sdo.HelloWorldClient"

-        />

-        

-        <reference name="helloWorldService" target="JavaHelloWorldServiceComponent" />

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ /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.    

--->

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

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ /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.    

--->

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

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ /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.    

--->

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

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ /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.    

--->

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

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ /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.    

--->

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

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ /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.    

--->

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

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
deleted file mode 100644
index c144a1bc18..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ /dev/null
@@ -1,90 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="ds.services.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>            

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent/RetailerService3" />

-    </component>

-    

-    <component name="RetailerComponent">

-        <!-- implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" -->

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

-                bundleSymbolicName="ds.services.supplychain.retailer.Retailer" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent/ShipperService2"  />

-    </component>

-    

-

-    <component name="ShipperComponent">

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

-            bundleSymbolicName="ds.services.supplychain.shipper.Shipper" >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-         </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/services-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/services-test.composite
deleted file mode 100644
index 64f3b30f88..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ /dev/null
@@ -1,89 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="services.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>            

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent/RetailerService3" />

-    </component>

-    

-    <component name="RetailerComponent">

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

-                bundleSymbolicName="services.supplychain.retailer.Retailer" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent/ShipperService2"  />

-    </component>

-    

-

-    <component name="ShipperComponent">

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

-            bundleSymbolicName="services.supplychain.shipper.Shipper"  >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-         </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
deleted file mode 100644
index 0b0aa0912b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="StockQuoteService">
-        <interface.java interface="stockquote.StockQuote"/>
-    </service>
-    
-    <property name="currency" type="xsd:string" >GBP</property> 
-    <property name="exchangeRate" type="xsd:double" >1.0</property> 
-    
-</componentType>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ /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.    

--->

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

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ /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.    

--->

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

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ /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.    

--->

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

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ /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.    

--->

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

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ /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.    

--->

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

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ /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.    

--->

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

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ /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.    

--->

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

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ /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.    

--->

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

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ /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.    

--->

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

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ /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.    

--->

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

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ /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.    

--->

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

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ /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.    

--->

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

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
deleted file mode 100644
index 877d0de1c9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ /dev/null
@@ -1,184 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent1">

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

-                bundleSymbolicName="ds.version.supplychain.customer.Customer"

-                bundleVersion="1.0.0" >

-                

-            <properties service="CustomerService">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />

-    </component>

-    

-    

-    

-    <component name="CustomerComponent2">

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

-                bundleSymbolicName="ds.version.supplychain.customer.Customer"

-                bundleVersion="2.0.0" >

-                

-            <properties service="CustomerService">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"

-                bundleVersion="1.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent1/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"

-                bundleVersion="2.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-             <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-    </component>

-

-   

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />

-    </component>

-

-    <component name="ShipperComponent1">

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

-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"

-                bundleVersion="1.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-                <property name="component.name">ShipperComponent1.ShipperService1</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-                <property name="component.name">ShipperComponent1.ShipperService2</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent1" />

-    </component>

-    

-     <component name="ShipperComponent2">

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

-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"

-                bundleVersion="2.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-                <property name="component.name">ShipperComponent2.ShipperService1</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-                <property name="component.name">ShipperComponent2.ShipperService2</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent2" />

-        

-    </component>

-    

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/version-test.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/version-test.composite
deleted file mode 100644
index bbb397ee70..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ /dev/null
@@ -1,170 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent1">

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

-                bundleSymbolicName="version.supplychain.customer.Customer"

-                bundleVersion="1.0.0" >

-                

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />

-    </component>

-    

-    

-    

-    <component name="CustomerComponent2">

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

-                bundleSymbolicName="version.supplychain.customer.Customer"

-                bundleVersion="2.0.0" >

-                

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="version.supplychain.retailer.Retailer"

-                bundleVersion="1.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="version.supplychain.retailer.Retailer"

-                bundleVersion="2.0.0"  >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-    </component>

-

-   

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />

-    </component>

-

-    <component name="ShipperComponent1">

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

-                bundleSymbolicName="version.supplychain.shipper.Shipper"

-                bundleVersion="1.0.0" >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent1" />

-    </component>

-    

-     <component name="ShipperComponent2">

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

-                bundleSymbolicName="version.supplychain.shipper.Shipper"

-                bundleVersion="2.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent2" />

-        

-    </component>

-    

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ /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.    

--->

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

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ /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.    

--->

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

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ /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.    

--->

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

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ /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.    

--->

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

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ /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.    

--->

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

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ /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.    

--->

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

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

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

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
deleted file mode 100644
index 617200d8dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

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

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    

-    <component name="RetailerComponent3">

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

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent2</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

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

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper" >

-            

-            <properties service="Shipper">

-                <property name="component.name">ShipperComponent1</property>

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

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

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper"  >

-            

-            <properties service="Shipper">

-                <property name="component.name">ShipperComponent2</property>

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
deleted file mode 100644
index 213cde2c1d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ /dev/null
@@ -1,151 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

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

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-    

-    <component name="WarehouseComponent1">

-        

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

-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-

-

-    <component name="WarehouseComponent2">

-        

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

-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

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

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

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

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
deleted file mode 100644
index 0dca0da75e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ /dev/null
@@ -1,127 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="wiring.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiCustomerImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

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

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent2"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

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

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

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

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
deleted file mode 100644
index 953045fefa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ /dev/null
@@ -1,151 +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://www.osoa.org/xmlns/sca/1.0"

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

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

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

-                bundleSymbolicName="wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

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

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

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

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

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

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-    

-    <component name="WarehouseComponent1">

-        

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

-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-

-

-    <component name="WarehouseComponent2">

-        

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

-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

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

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

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

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
deleted file mode 100644
index c621d9aca0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ /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.    

--->

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

-    <service name="OSGiHelloWorld">

-        <interface.java interface="helloworld.HelloWorld"/>

-    </service>

-    

-    

-    <reference name="helloWorldWS" >

-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->

-        <interface.java interface="helloworld.ws.HelloWorld" />

-    </reference>

-      

-</componentType>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
deleted file mode 100644
index 6d3f853382..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ /dev/null
@@ -1,80 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

-                <wsdlsoap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
deleted file mode 100644
index d545c844d2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ /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.    

--->

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

-           name="HelloWorld">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </service>

-

-    <component name="HelloWorldService">

-        <implementation.java class="helloworld.ws.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <!--implementation.java class="helloworld.HelloWorldComponent"/-->

-        

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

-            bundleSymbolicName="helloworld.HelloWorld"

-        />

-        

-        <service name="OSGiHelloWorld"/>

-        

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
deleted file mode 100644
index 54b9b00bc8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ /dev/null
@@ -1,30 +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 callback;
-
-
-public class Callback1TestCase extends CallbackTestCase {
-
-    public Callback1TestCase() {
-        super("callback-test1.composite");
-    }
-    
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
deleted file mode 100644
index b26bfbd98d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ /dev/null
@@ -1,29 +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 callback;
-
-
-public class Callback2TestCase extends CallbackTestCase {
-
-    public Callback2TestCase() {
-        super("callback-test2.composite");
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
deleted file mode 100644
index 667df7aa12..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ /dev/null
@@ -1,29 +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 callback;
-
-
-public class Callback3TestCase extends CallbackTestCase {
-
-    public Callback3TestCase() {
-        super("callback-test3.composite");
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
deleted file mode 100644
index a95437f8c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ /dev/null
@@ -1,50 +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 callback;
-
-
-import callback.client.CallbackClient;
-
-import test.OSGiTestCase;
-
-public abstract class CallbackTestCase extends OSGiTestCase {
-
-    private CallbackClient aCallbackClient;
-    
-    protected String compositeName;
-    
-   
-    public CallbackTestCase(String compositeName) {
-        super(compositeName, "callback");
-    }
-
-   
-
-    protected void setUp() throws Exception {
-    	super.setUp();
-        aCallbackClient = scaDomain.getService(CallbackClient.class, "CallbackClient");
-    }
-
-    
-    public void test() throws Exception {
-        aCallbackClient.run(); 
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
deleted file mode 100644
index c5d94df93d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ /dev/null
@@ -1,325 +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 conversation;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import conversation.client.ConversationalClient;
-
-import test.OSGiTestCase;
-
-public class ConversationTestCase  extends OSGiTestCase {
-
-    private ConversationalClient conversationalStatelessClientStatelessService;
-    private ConversationalClient conversationalStatelessClientStatefulService;
-    private ConversationalClient conversationalStatefulClientStatelessService;
-    private ConversationalClient conversationalStatefulClientStatefulService; 
-    
-    public ConversationTestCase() {
-    	super("conversation-test.composite", "conversation");
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        
-        try {
-
-        	super.setUp();
-
-            conversationalStatelessClientStatelessService = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatelessClientStatelessService/ConversationalClient");
-
-            conversationalStatelessClientStatefulService  = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatelessClientStatefulService/ConversationalClient");
-
-            conversationalStatefulClientStatelessService  = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatefulClientStatelessService/ConversationalClient");
-
-            conversationalStatefulClientStatefulService   = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatefulClientStatefulService/ConversationalClient");
-
-
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-            
-            throw e;
-        }
-               
-    }
-
-    
-    // stateless client stateful service tests
-    // =======================================
-    @Test
-    public void testStatelessStatefulConversationFromInjectedReference() {
-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatelessStatefulConversationFromServiceReference() {
-        int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }          
-    
-    @Test
-    public void testStatelessStatefulConversationWithUserDefinedConversationId() {
-        int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }   
-    
-     @Test
-    public void testStatelessStatefulConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    } 
-    
-     @Test
-    public void testStatelessStatefulConversationCheckingScope() {
-        conversationalStatelessClientStatefulService.runConversationCheckingScope();
-        
-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatelessClientStatefulService.getServiceCalls());
-    }     
-    
-     @Test
-    public void testStatelessStatefulConversationWithCallback() {
-        int count = conversationalStatelessClientStatefulService.runConversationWithCallback();
-        Assert.assertEquals(0, count);
-               
-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,init,", 
-                conversationalStatelessClientStatefulService.getCalls());        
-    }  
-    
-    /////@Test
-    public void _testStatelessStatefulConversationHavingPassedReference() {
-        int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    }    
-  
-    @Test
-    public void testStatelessStatefulConversationBusinessException() {
-        String message = conversationalStatelessClientStatefulService.runConversationBusinessException();
-        Assert.assertEquals("Business Exception", message);
-    }     
-    
-    @Test
-    public void testStatelessStatefulConversationBusinessExceptionCallback() {
-        String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();
-        Assert.assertEquals("Business Exception", message);
-    }  
-    
-    @Test
-    public void testStatelessStatefulConversationCallingEndedConversation() {
-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();
-        Assert.assertEquals(0, count);
-    }     
-    
-    @Test
-    public void testStatelessStatefulConversationCallingEndedConversationCallback() {
-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    }     
-    
-    // stateless client stateless service tests
-    // ========================================
-    @Test
-    public void testStatelessStatelessConversationFromInjectedReference() {
-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatelessStatelessConversationFromServiceReference() {
-        int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }    
-    
-    @Test
-    public void testStatelessStatelessConversationWithUserDefinedConversationId() {
-        int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }  
-    @Test
-    public void testStatelessStatelessConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    }     
-    
-    @Test
-    public void testStatelessStatelessConversationCheckingScope() {
-        conversationalStatelessClientStatelessService.runConversationCheckingScope();
-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,init,", 
-                conversationalStatelessClientStatelessService.getServiceCalls());
-    }       
-    
-    @Test
-    public void testStatelessStatelessConversationWithCallback() {
-        int count = conversationalStatelessClientStatelessService.runConversationWithCallback();
-        Assert.assertEquals(0, count);
-             
-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,init,", 
-                conversationalStatelessClientStatelessService.getCalls());        
-    }
-    /////@Test
-    public void _testStatelessStatelessConversationHavingPassedReference() {
-        int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    }     
-
-    @Test
-    public void testStatelessStatelessConversationCallingEndedConversation() {
-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();
-        Assert.assertEquals(-999, count);
-    }     
-    
-    @Test
-    public void testStatelessStatelessConversationCallingEndedConversationCallback() {
-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    } 
-
-    // stateful client stateful service tests  
-    // ======================================
-    @Test
-    public void testStatefulStatefulConversationFromInjectedReference() {
-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatefulStatefulConversationFromServiceReference() {
-        int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }          
-    
-    @Test
-    public void testStatefulStatefulConversationWithUserDefinedConversationId() {
-        int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }    
-    
-    @Test
-    public void testStatefulStatefulConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    } 
-    
-    @Test
-    public void testStatefulStatefulConversationCheckingScope() {
-        conversationalStatefulClientStatefulService.runConversationCheckingScope();
-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatefulClientStatefulService.getServiceCalls());
-    }  
-
-    @Test
-    public void testStatefulStatefulConversationWithCallback() {
-        int count = conversationalStatefulClientStatefulService.runConversationWithCallback();
-        //System.out.println("Calls: " + conversationalStatefulClientStatefulService.getCalls());
-        Assert.assertEquals(4, count);
-              
-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatefulClientStatefulService.getCalls());        
-    }   
-    
-    /////@Test
-    public void _testStatefulStatefulConversationHavingPassedReference() {
-        int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    } 
-    
-    @Test
-    public void testStatefulStatefulConversationCallingEndedConversation() {
-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();
-        Assert.assertEquals(0, count);
-    }     
-    
-    @Test
-    public void testStatefulStatefulConversationCallingEndedConversationCallback() {
-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    }     
-   
-    // stateful client stateless service tests  
-    // =======================================
-    @Test
-    public void testStatefulStatelessConversationFromInjectedReference() {
-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatefulStatelessConversationFromServiceReference() {
-        int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }    
-    
-    @Test
-    public void testStatefulStatelessConversationWithUserDefinedConversationId() {
-        int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }    
-
-    @Test
-    public void testStatefulStatelessConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    } 
-    
-    @Test
-    public void testStatefulStatelessConversationCheckingScope() {
-        conversationalStatefulClientStatelessService.runConversationCheckingScope();
-        
-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,init,", 
-                conversationalStatefulClientStatelessService.getServiceCalls());
-    } 
-    
-    @Test
-    public void testStatefulStatelessConversationWithCallback() {
-        int count = conversationalStatefulClientStatelessService.runConversationWithCallback();
-        Assert.assertEquals(4, count);
-        
-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatefulClientStatelessService.getCalls());        
-    }     
-    
-    /////@Test
-    public void _testStatefulStatelessConversationHavingPassedReference() {
-        int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    }     
-    
-    @Test
-    public void testStatefulStatelessConversationCallingEndedConversation() {
-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();
-        Assert.assertEquals(-999, count);
-    }     
-    
-    @Test
-    public void testStatefulStatelessConversationCallingEndedConversationCallback() {
-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    }        
-        
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
deleted file mode 100644
index d340923938..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ /dev/null
@@ -1,130 +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 helloworld.passbyref;
-
-import helloworld.Greetings;
-import test.OSGiTestCase;
-
-
-public class PassByRefTestCase extends OSGiTestCase {
-
-    private Greetings greetingsJava;
-    private Greetings greetingsOSGi;
-    private String[] origNames = {"world"};
-    private String[] names;
-    
-    public PassByRefTestCase() {
-    	super("passbyref-test.composite", "passbyref");
-    }
-
-    protected void setUp() throws Exception {
-
-    	super.setUp();
-        greetingsJava = scaDomain.getService(Greetings.class, "JavaGreetingsComponent");
-        greetingsOSGi = scaDomain.getService(Greetings.class, "OSGiGreetingsComponent");
-        
-        names = new String[origNames.length];
-        System.arraycopy(origNames, 0, names, 0, names.length);
-    }
-    
-    
-    public void test() throws Exception {
-        
-        javaOSGiPassByValue();
-        osgiJavaPassByValue();
-        javaOSGiPassByRef();
-        osgiJavaPassByRef();
-        
-    }
-    
-
-    public void javaOSGiPassByValue() throws Exception {
-        
-        String[] greetings = greetingsJava.getGreetingsFromJava(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals(origNames[i], names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From Java)(From OSGi)");
-        }
-        
-    }
-    
-    public void osgiJavaPassByValue() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsOSGi.getGreetingsFromOSGi(names);
-        
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals(origNames[i], names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From OSGi)(From Java)");
-        }
-        
-
-
-    }
-    
-    public void javaOSGiPassByRef() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsJava.getModifiedGreetingsFromJava(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals("Hello " + origNames[i] + "(From Java)(From OSGi)", names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From Java)(From OSGi)");
-        }
-    }
-    
-    public void osgiJavaPassByRef() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsOSGi.getModifiedGreetingsFromOSGi(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals("Hello " + origNames[i] + "(From OSGi)(From Java)", names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From OSGi)(From Java)");
-        }
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
deleted file mode 100644
index c1f11d0b6e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ /dev/null
@@ -1,95 +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 helloworld.sdo;
-
-import helloworld.sdo.client.HelloWorldClient;
-
-import java.io.File;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import util.OSGiTestUtil;
-
-
-public class SdoTestCase extends TestCase {
-
-    
-    private EmbeddedSCADomain scaDomain;
-    
-    
-    protected void setUp() throws Exception {
-
-        OSGiTestUtil.setUpOSGiTestRuntime();
-
-        scaDomain = new EmbeddedSCADomain(this.getClass().getClassLoader(), "http://localhost");
-        scaDomain.start();
-        ContributionService contributionService = scaDomain.getContributionService();
-        
-        URL serviceURL = new File("./target/classes/sdo/ds/HelloWorldService.jar").toURI().toURL();
-        URL clientURL = new File("./target/classes/sdo/ds/HelloWorldClient.jar").toURI().toURL();
-        
-        Contribution serviceContribution = contributionService.contribute("HelloWorldService", serviceURL, true);
-        Contribution clientContribution = contributionService.contribute("HelloWorldClient", clientURL, true);
-        
-        for (Composite deployable : serviceContribution.getDeployables()) {
-            scaDomain.getDomainComposite().getIncludes().add(deployable);
-            scaDomain.buildComposite(deployable);
-        }
-        for (Composite deployable : clientContribution.getDeployables()) {
-            scaDomain.getDomainComposite().getIncludes().add(deployable);
-            scaDomain.buildComposite(deployable);
-        }
-        for (Composite deployable : clientContribution.getDeployables() ) {
-            scaDomain.getCompositeActivator().activate(deployable);
-            scaDomain.getCompositeActivator().start(deployable);
-        }
-    }
-
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-    
-
-    public void testJavaToOSGi() throws Exception {
-
-        HelloWorldClient helloWorldClient = scaDomain.getService(HelloWorldClient.class, "JavaHelloWorldClientComponent");
-        String greetings = helloWorldClient.getGreetings("Apache", "Tuscany");
-        System.out.println(greetings);
-        assertEquals("Hello Apache Tuscany", greetings);
-    }
-    
-    public void testOSGiToJava() throws Exception {
-
-        HelloWorldClient helloWorldClient = scaDomain.getService(HelloWorldClient.class, "OSGiHelloWorldClientComponent");
-        String greetings = helloWorldClient.getGreetings("Apache", "Tuscany");
-        System.out.println(greetings);
-        assertEquals("Hello Apache Tuscany", greetings);
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
deleted file mode 100644
index 49afb3d8e8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ /dev/null
@@ -1,55 +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 helloworld.ws;
-
-import helloworld.HelloWorld;
-
-
-import test.OSGiTestCase;
-import util.OSGiTestUtil;
-
-
-public class HelloWorldTestCase extends OSGiTestCase {
-
-    private HelloWorld helloWorld;
-    
-    public HelloWorldTestCase() {
-    	super("ws-helloworld.composite", "ws");
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        helloWorld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
-    }
-    
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-    
-
-    public void testHelloWorld() throws Exception {
-        String greetings = helloWorld.getGreetings("petra");
-        System.out.println(greetings);
-        assertEquals("Hello petra", greetings);
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
deleted file mode 100644
index a858c18a90..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ /dev/null
@@ -1,63 +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 supplychain;
-
-import supplychain.customer.Customer;
-import test.OSGiTestCase;
-
-/**
- * Test case for supplychain - it is invoked with different composite files to test 
- * various scenarios.
- */
-public abstract class SupplyChainTestCase extends OSGiTestCase {
-
-    public Customer customer;
-    
-   
-    public SupplyChainTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-
-    protected void setUp() throws Exception {
-
-    	super.setUp();
-        customer = scaDomain.getService(Customer.class, "CustomerComponent");
-    }
-    
-    public void test() throws Exception {
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseBooks();
-        customer.purchaseGames();
-        long timeout = 5000L;
-        while (timeout > 0) {
-            if (customer.hasOutstandingOrders()) {
-                Thread.sleep(100);
-                timeout -= 100;
-            } else
-                break;
-        }
-        assertFalse(customer.hasOutstandingOrders());
-
-        System.out.println("Test complete");
-        
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
deleted file mode 100644
index a9941aebcd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ /dev/null
@@ -1,71 +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 supplychain;
-
-import supplychain.customer.Customer;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - common code for versioned bundles
- */
-public abstract class VersionedSupplyChainTestCase extends OSGiTestCase {
-    
-    private Customer customer1;
-    private Customer customer2;
-    
-
-    public VersionedSupplyChainTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-    
-    protected void setUp() throws Exception {
-        
-        super.setUp();
-        customer1 = scaDomain.getService(Customer.class, "CustomerComponent1");
-        customer2 = scaDomain.getService(Customer.class, "CustomerComponent2");
-    }
-    
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        Thread.sleep(2000);
-    }
-   
-    public void test() throws Exception {
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        customer1.purchaseBooks();
-        customer2.purchaseGames();
-        long timeout = 5000L;
-        while (timeout > 0) {
-            if (customer1.hasOutstandingOrders()) {
-                Thread.sleep(100);
-                timeout -= 100;
-            } else if (customer2.hasOutstandingOrders()) {
-                Thread.sleep(100);
-                timeout -= 100;
-            } else
-                break;
-        }
-        assertFalse(customer1.hasOutstandingOrders());
-        assertFalse(customer2.hasOutstandingOrders());
-
-        System.out.println("Test complete");
-        
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
deleted file mode 100644
index 8e939b1a83..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.factory;
-
-
-/**
- * OSGi test program - declarative with scopes other than composites which use OSGi service factories
- */
-public class DSFactoryTestCase extends FactoryTestCase {
-
-    public DSFactoryTestCase() {
-        super("factory-ds-test.composite", "factory/ds");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
deleted file mode 100644
index 39d90bb75c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ /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.    
- */
-package supplychain.factory;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with scopes other than composites which use OSGi service factories
- */
-public class FactoryTestCase extends SupplyChainTestCase {
-    /**
-     * This constant defines the time period (in milliseconds) for which we are prepared to wait for
-     * the @OneWay notifyShipment() callback to run. 
-     */
-    private static final long MAX_WAIT_TIME_FOR_CALLBACK = 10000;
-
-    public FactoryTestCase() {
-        super("factory-test.composite", "factory");
-    }
-    
-    protected FactoryTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-    
-    
-    @Override
-    public void test() throws Exception {
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseBooks();
-        waitForOrderShipmentNotification();                // TUSCANY-2198 notifyShipment() callback is @OneWay 
-        assertFalse(customer.hasOutstandingOrders());
-        
-        customer.purchaseGames();       
-        waitForOrderShipmentNotification();                // TUSCANY-2198 notifyShipment() callback is @OneWay 
-        assertFalse(customer.hasOutstandingOrders());
-
-        Thread.sleep(2000);
-        System.out.println("Test complete");
-        
-    }
-
-    /**
-     * Since the notifyShipment() callback on the Customer is @OneWay, we need to allow
-     * some time for it to complete as it is runs asynchronously.
-     *
-     * This is for TUSCANY-2198
-     */
-    private void waitForOrderShipmentNotification() throws InterruptedException {
-        long startTime = System.currentTimeMillis();
-        while (customer.hasOutstandingOrders()
-                && System.currentTimeMillis() - startTime < MAX_WAIT_TIME_FOR_CALLBACK) {
-            Thread.sleep(100);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
deleted file mode 100644
index 5376687b61..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.interfaces;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with components exposing multiple services with multiple interfaces
- */
-public class DSInterfacesTestCase extends SupplyChainTestCase {
-
-    public DSInterfacesTestCase() {
-        super("interfaces-ds-test.composite", "interfaces/ds");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
deleted file mode 100644
index 6d8dc1021e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.interfaces;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with components exposing multiple services with multiple interfaces
- */
-public class InterfacesTestCase extends SupplyChainTestCase {
-
-    public InterfacesTestCase() {
-        super("interfaces-test.composite", "interfaces");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
deleted file mode 100644
index e037ae9675..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ /dev/null
@@ -1,31 +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 supplychain.properties;
-
-
-/**
- * OSGi test program - declarative with business properties
- */
-public class DSProperties2TestCase extends Properties2TestCase {
-
-    public DSProperties2TestCase() {
-        super("properties2-ds-test.composite", "properties/ds");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
deleted file mode 100644
index eecf67913d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ /dev/null
@@ -1,31 +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 supplychain.properties;
-
-
-/**
- * OSGi test program - declarative with business properties
- */
-public class DSPropertiesTestCase extends PropertiesTestCase {
-
-    public DSPropertiesTestCase() {
-        super("properties-ds-test.composite", "properties/ds");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
deleted file mode 100644
index 203bf5123c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ /dev/null
@@ -1,69 +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 supplychain.properties;
-
-
-import stockquote.StockQuote;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - procedural with business properties
- */
-public class Properties2TestCase extends OSGiTestCase {
-    
-
-    private StockQuote stockQuoteServiceUSD;
-    private StockQuote stockQuoteServiceEURO;
-    
-    public Properties2TestCase() {
-        super("properties2-test.composite", "properties");
-    }
-    
-    protected Properties2TestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-
-    protected void setUp() throws Exception {
-        
-        super.setUp();
-        stockQuoteServiceUSD = scaDomain.getService(StockQuote.class, "USDStockQuoteComponent");
-        stockQuoteServiceEURO = scaDomain.getService(StockQuote.class, "EUROStockQuoteComponent");
-    }
-    
-    public void test() throws Exception {
-    
-        double stockQuote = stockQuoteServiceUSD.getQuote("IBM");
-        
-        double expectedValue = 52.81 * 2.0;
-        
-        System.out.println("IBM: $" + stockQuote);
-        
-        assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1);
-        
-        double stockQuote2 = stockQuoteServiceEURO.getQuote("IBM");
-        
-        double expectedValue2 = 52.81 * 1.48;
-        
-        System.out.println("IBM: Euro " + stockQuote2);
-        
-        assertTrue(stockQuote2 > expectedValue2 - 0.1 && stockQuote2 < expectedValue2 + 0.1);
-        
-    }
-        
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
deleted file mode 100644
index 429b1f10ef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ /dev/null
@@ -1,58 +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 supplychain.properties;
-
-import stockquote.StockQuote;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - procedural with business properties
- */
-public class PropertiesTestCase extends OSGiTestCase {
-    
-
-    private StockQuote stockQuoteService;
-    
-    public PropertiesTestCase() {
-        super("properties-test.composite", "properties");
-    }
-    
-    protected PropertiesTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        stockQuoteService = scaDomain.getService(StockQuote.class, "StockQuoteComponent");
-    }
-    
-    
-    public void test() throws Exception {
-    
-        double stockQuote = stockQuoteService.getQuote("IBM");
-        
-        double expectedValue = 52.81 * 2.0;
-        
-        System.out.println("IBM: " + stockQuote);
-        
-        assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1);
-        
-    }
-        
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
deleted file mode 100644
index dbc980f8c4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.services;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with components exposing multiple services
- */
-public class DSServicesTestCase extends SupplyChainTestCase {
-
-    public DSServicesTestCase() {
-        super("services-ds-test.composite", "services/ds");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
deleted file mode 100644
index e39295a402..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.services;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with components exposing multiple services
- */
-public class ServicesTestCase extends SupplyChainTestCase {
-
-    public ServicesTestCase() {
-        super("services-test.composite", "services");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
deleted file mode 100644
index c2f6bff4f5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.version;
-
-import supplychain.VersionedSupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with versioning
- */
-public class DSVersionTestCase extends VersionedSupplyChainTestCase {
-    
-    public DSVersionTestCase() {
-        super("version-ds-test.composite", "version/ds");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
deleted file mode 100644
index 17ba7a2f14..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.version;
-
-import supplychain.VersionedSupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with versioning
- */
-public  class VersionTestCase extends VersionedSupplyChainTestCase {
-    
-    public VersionTestCase() {
-        super("version-test.composite", "version");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
deleted file mode 100644
index 8c33720018..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with SCA wiring
- */
-public class DSWiring1TestCase extends SupplyChainTestCase {
-
-    public DSWiring1TestCase() {
-        super("wiring-ds-test1.composite", "wiring/ds");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
deleted file mode 100644
index 0c6edd6691..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with SCA wiring 
- */
-public class DSWiring2TestCase extends SupplyChainTestCase {
-
-    public DSWiring2TestCase() {
-        super("wiring-ds-test2.composite", "wiring/ds");
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
deleted file mode 100644
index 0b48ac90ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with SCA wiring
- */
-public class Wiring1TestCase extends SupplyChainTestCase {
-
-    public Wiring1TestCase() {
-        super("wiring-test1.composite", "wiring");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
deleted file mode 100644
index c84741f34f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ /dev/null
@@ -1,32 +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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with SCA wiring
- */
-public class Wiring2TestCase extends SupplyChainTestCase {
-
-    public Wiring2TestCase() {
-        super("wiring-test2.composite", "wiring");
-    }
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
deleted file mode 100644
index 5a9b2a8b1d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ /dev/null
@@ -1,67 +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 test;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import util.OSGiTestUtil;
-
-/**
- * Test case setup base code - it is invoked with different composite files to test 
- * various scenarios.
- */
-public abstract class OSGiTestCase extends TestCase {
-
-    private String compositeName;
-    private String contributionLocation;
-    public SCADomain scaDomain;
-
-    public OSGiTestCase(String compositeName, String contributionLocation) {
-        super();
-        this.compositeName = compositeName;
-        this.contributionLocation = contributionLocation;
-        try {
-            if (contributionLocation != null) {
-                File f = new File("target/classes/" + contributionLocation);
-                this.contributionLocation = f.toURL().toString();
-            }
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    protected void setUp() throws Exception {
-
-        OSGiTestUtil.setUpOSGiTestRuntime();
-
-        scaDomain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName);
-    }
-
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
deleted file mode 100644
index 7b95c12038..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ /dev/null
@@ -1,71 +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 util;
-
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-
-/**
- * OSGi Test Utils
- */
-public  class OSGiTestUtil  {
-    
-    public static void setUpOSGiTestRuntime() throws Exception {
-
-        setUpFelixTestRuntime();
-    }
-    
-    
-    private static void setUpFelixTestRuntime() throws Exception {
-
-        String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
-        
-        System.setProperty("felix.config.properties", felixConfigFileName);
-        
-        try {
-            
-            ClassLoader cl = OSGiTestUtil.class.getClassLoader();
-            
-            Class felixMainClass = cl.loadClass("org.apache.felix.main.Main");
-            if (felixMainClass != null) {
-                String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();
-                int index = 0;
-                if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {
-                    felixDir = felixDir.substring(0, index);
-                    System.setProperty("FELIX_DIR", felixDir);
-                }
-            }
-            
-        } catch (Exception e) {
-            // Ignore
-        }
-        
-        
-    }
-    
-    public static void shutdownOSGiRuntime()  {
-        try {
-            OSGiRuntime.stop();
-        
-        } catch (Exception e) {
-            // Ignore
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
deleted file mode 100644
index 8399991503..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ /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.    
-#
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0 \
- org.osgi.util.tracker; version=1.3.2 
-
-
-felix.auto.start.1= \
-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 
-
-
-#    "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
-#    "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
-#    "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
-
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-obr.shell.telnet=on
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
deleted file mode 100644
index 2b797cd45f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ /dev/null
@@ -1,99 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-test</artifactId>
-    <name>Apache Tuscany OSGi-Based Tuscany Runtime Tests</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.3.2.R33x_v20080105</version>
-        </dependency>
-
-
-<!--  Uncomment this section and comment out the Equinox dependency above to run tests using Felix.
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>javax.servlet</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
-End Felix dependencies -->
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                  <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>ops4j-repository</id>
-            <url>http://repository.ops4j.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
deleted file mode 100644
index ab43b50273..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
+++ /dev/null
@@ -1,91 +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.test.osgi.runtime.impl;
-
-import java.lang.reflect.Method;
-
-import org.osgi.framework.BundleContext;
-
-public class EquinoxTestRuntime extends OSGiTestRuntime  {
-    
-    
-    private static BundleContext bundleContext;
-    
-    private static EquinoxTestRuntime instance;
-    
-    private static Class<?> eclipseStarterClass;
-    
-    public static OSGiTestRuntime getInstance() throws Exception {
-        if (instance == null) {
-            eclipseStarterClass = EquinoxTestRuntime.class.getClassLoader().loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter");
-            EquinoxTestRuntime runtime = new EquinoxTestRuntime();
-            instance = runtime;
-        }
-        return instance;
-    }
-    
-    
-    protected BundleContext startRuntime() throws Exception {
-        
-        if (bundleContext != null)
-            return bundleContext;
-                    
-        Method startupMethod = eclipseStarterClass.getMethod("startup", String [].class, Runnable.class);
-        
-        // Equinox version 3.2 upwards have a startup method which returns BundleContext
-        bundleContext = (BundleContext) startupMethod.invoke(null, 
-                new String[] {/*"-clean", */"-console", "-configuration", "target/configuration"}, 
-                null );        
-        
-        return bundleContext;
-        
-    }
-
-    @Override
-    public BundleContext getBundleContext() {
-        return bundleContext;
-    }
-
-    @Override
-    protected void setBundleContext(BundleContext bundleContext) {
-        super.setBundleContext(bundleContext);
-        EquinoxTestRuntime.bundleContext = bundleContext;
-    }
-    
-    @Override
-    public void shutdown() throws Exception {
-
-        if (bundleContext == null)
-            return;
-        bundleContext = null;
-        instance = null;
-        if (eclipseStarterClass != null) {
-            Method shutdownMethod = eclipseStarterClass.getMethod("shutdown");
-            try {
-                shutdownMethod.invoke(eclipseStarterClass);
-            } catch (Exception e) {
-                // Ignore errors.
-            }
-        }
-        super.shutdown();
-    }
-
-
-   
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
deleted file mode 100644
index 9e4a9fb9d0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ /dev/null
@@ -1,197 +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.test.osgi.runtime.impl;

-

-import java.io.File;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.Method;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-import java.util.Properties;

-

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-public class FelixTestRuntime extends OSGiTestRuntime implements BundleActivator {

-    

-    private static BundleContext bundleContext;

-    

-    private static FelixTestRuntime instance;

-    

-    private static Bundle felix;

-    

-    

-    public static OSGiTestRuntime getInstance() throws Exception {

-        if (instance == null) {

-            

-            FelixTestRuntime runtime = new FelixTestRuntime();

-            instance = runtime;

-        }

-        return instance;

-    }

-    

-    

-//    private void deleteDirectory(File dir) {

-//        File[] files = dir.listFiles();

-//        for (int i = 0; i < files.length; i++) {

-//            if (files[i].isDirectory()) 

-//                deleteDirectory(files[i]);

-//            else {

-//                files[i].delete();

-//            }

-//        }

-//        dir.delete();

-//        

-//    }

-    

-//    private void deleteProfile() {

-//        String profileDirName = System.getProperty("felix.cache.profiledir");

-//        if (profileDirName == null) profileDirName = ".felix";

-//        File profileDir = new File(profileDirName); 

-//        if (profileDir.isDirectory())  

-//            deleteDirectory(profileDir);

-//        else

-//            profileDir.delete();

-//    }

-    

-    protected BundleContext startRuntime() throws Exception {

-        

-        if (bundleContext != null)

-            return bundleContext;

-        

-        ClassLoader cl = this.getClass().getClassLoader();

-        Class<?> felixMainClass = cl.loadClass("org.apache.felix.main.Main");

-        Class<?> felixClass = cl.loadClass("org.apache.felix.framework.Felix");

-        Method propsMethod = felixMainClass.getMethod("loadConfigProperties");

-        Properties props = (Properties)propsMethod.invoke(null);

-        

-        //deleteProfile();

-        // Create profile directory

-        String profileDirName = System.getProperty("felix.cache.profiledir");

-        if (profileDirName == null) profileDirName = ".felix";

-        File profileDir = new File(profileDirName); 

-        profileDir.mkdir();

-        

-        props.put("felix.cache.profiledir", profileDir.getAbsolutePath());

-        props.put("felix.embedded.execution", "true");

-        String systemPackages =

-                "org.osgi.framework; version=1.3.0," +

-                "org.osgi.service.packageadmin; version=1.2.0, " +

-                "org.osgi.service.startlevel; version=1.0.0, " +

-                "org.osgi.service.url; version=1.0.0, " +

-                "org.osgi.util.tracker; version=1.3.2, " +

-                "javax.xml, " +

-                "javax.xml.datatype, " +               

-                "javax.xml.namespace, " +

-                "javax.xml.parsers, " +

-                "javax.xml.transform, " +

-                "javax.xml.transform.dom, " +

-                "javax.xml.transform.sax, " +

-                "javax.xml.transform.stream, " +

-                "javax.xml.validation, " +

-                "javax.xml.xpath, " +

-                "javax.sql," +

-                "org.w3c.dom, " +

-                "org.xml.sax, " +

-                "org.xml.sax.ext, " +

-                "org.xml.sax.helpers, " +

-                "javax.security.auth, " +

-                "javax.security.auth.login, " +

-                "javax.security.auth.callback, " +

-                "javax.naming, " +

-                "javax.naming.spi, " +

-                "javax.naming.directory, " +

-                "javax.management, " + 

-                "sun.misc, " +

-                "javax.net, " +

-                "javax.crypto, " +

-                "javax.rmi, " +

-                "javax.transaction, " +

-                "javax.transaction.xa, " +

-                

-                "org.apache.felix.main";

-        

-        

-        props.put("org.osgi.framework.system.packages", systemPackages);

-        

-        Constructor felixConstructor = felixClass.getConstructor(Map.class, List.class);

-        List<BundleActivator> activators = new ArrayList<BundleActivator>();

-

-        Class<?> autoActivatorClass = cl.loadClass("org.apache.felix.main.AutoActivator");

-        Constructor autoActivatorConstructor = autoActivatorClass.getConstructor(Map.class);

-        BundleActivator autoActivator = (BundleActivator)autoActivatorConstructor.newInstance(props);            

-        activators.add(autoActivator);

-        felix = (Bundle)felixConstructor.newInstance(props, activators);

-        felix.start();

-        bundleContext = felix.getBundleContext();

-                   

-        return bundleContext;

-        

-    }

-

-    public void start(BundleContext context) throws Exception {

-        

-        bundleContext = context;

-        synchronized (this) {

-            this.notify();

-        }

-    }

-

-    public void stop(BundleContext context) throws Exception {

-        bundleContext = null;

-    }

-    

-    

-    

-    @Override

-    public BundleContext getBundleContext() {

-        return bundleContext;

-    }

-    

-    @Override

-    protected void setBundleContext(BundleContext bundleContext) {

-        super.setBundleContext(bundleContext);

-        FelixTestRuntime.bundleContext = bundleContext;

-    }

-

-

-    @Override

-    public void shutdown() throws Exception {

-

-        if (bundleContext == null)

-            return;

-        

-        bundleContext = null;

-        instance = null;

-        

-        felix.stop();

-        int retries = 50;

-        synchronized (felix) {

-            while (retries-- > 0 && felix.getState() != Bundle.UNINSTALLED) {

-                felix.wait(100);

-            }

-        }

-        

-        super.shutdown();

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
deleted file mode 100644
index 354c545f03..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ /dev/null
@@ -1,114 +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.test.osgi.runtime.impl;

-

-import java.lang.reflect.Method;

-

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.BundleException;

-

-public abstract class OSGiTestRuntime {

-

-    public abstract BundleContext getBundleContext();

-

-    protected abstract BundleContext startRuntime() throws Exception;

-       

-    private static OSGiTestRuntime instance;

-    

-    private BundleContext bundleContext;

-    

-    

-    /**

-     * System property org.apache.tuscany.implementation.osgi.runtime.OSGiRuntime can be set to the

-     * name of the OSGiRuntime class (eg. EquinoxRuntime). If set, start this runtime and return the

-     * system bundlecontext. If not set, start Felix from the classpath.

-     * 

-     * @throws BundleException

-     */

-    public synchronized static OSGiTestRuntime findRuntime() throws Exception {

-        if (instance != null) {            

-            return instance;

-        }

-        String runtimeClassName = System.getProperty(OSGiTestRuntime.class.getName());

-        

-        if (instance != null)

-            return instance;

-

-        if (runtimeClassName != null) {

-            try {

-                Class<?> runtimeClass = OSGiTestRuntime.class.getClassLoader().loadClass(runtimeClassName);

-                Method method = runtimeClass.getMethod("getInstance");

-                instance = (OSGiTestRuntime) method.invoke(null);

-                return instance;

-                

-            } catch (Exception e) {

-                throw new BundleException("Could not start OSGi runtime " + runtimeClassName, e);

-            }

-        }

-

-        try {

-            instance = EquinoxTestRuntime.getInstance();

-        } catch (Throwable e) {

-            instance = FelixTestRuntime.getInstance();

-        }

-        

-        return instance;

- 

-    }

-    

- 

-    public synchronized static OSGiTestRuntime getRuntime() throws Exception {

-        

-        instance = findRuntime();

-        

-        if (instance != null) {

-            

-            if (instance.bundleContext == null) {

-                instance.startRuntime();

-                instance.bundleContext = instance.getBundleContext();

-            }

-            return instance;

-        }

-        return instance;

-    }

-

-

-    public void shutdown() throws Exception {

-        

-        bundleContext = null;

-        if (this == instance)

-            instance = null;

-    }

-    

-    protected void setBundleContext(BundleContext bundleContext) {

-        this.bundleContext = bundleContext;

-    }

-    

-

-    /**

-     * @return the instance

-     */

-    public synchronized static void stop() throws Exception {

-        if (instance != null) {

-            instance.shutdown();

-            instance = null;

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
deleted file mode 100644
index c9f77b71cf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ /dev/null
@@ -1,86 +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.test.util;

-

-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;

-

-

-

-/**

- * OSGi Test Utils : Set up OSGi runtime

- */

-public  class OSGiRuntimeLoader  {

-    

-    public static OSGiTestRuntime startOSGiTestRuntime() throws Exception {

-

-        setUpFelixTestRuntime();

-        

-

-        System.setProperty("felix.cache.profiledir", "target/.felix.test");

-        

-        OSGiTestRuntime osgiRuntime = OSGiTestRuntime.getRuntime();

-

-        System.setProperty("felix.cache.profiledir", ".felix");

-        

-        return osgiRuntime;

-        

-    }

-    

-    public static void setUpOSGiTestRuntime() throws Exception {

-

-        setUpFelixTestRuntime();

-        

-    }

-    

-    

-    private static void setUpFelixTestRuntime() throws Exception {

-

-        String felixConfigFileName = "file:target/test-classes/felix/felix.config.properties";

-        

-        System.setProperty("felix.config.properties", felixConfigFileName);

-        

-        System.setProperty("felix.service.urlhandlers", "false");

-        

-        

-        try {

-            Class<?> felixMainClass = OSGiRuntimeLoader.class.getClassLoader().loadClass("org.apache.felix.main.Main");

-            String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();

-            int index = 0;

-            if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {

-                felixDir = felixDir.substring(0, index);

-                System.setProperty("FELIX_DIR", felixDir);

-            }

-            

-        } catch (Throwable e) {

-            // Ignore

-        }

-        

-        

-    }

-    

-    public static void shutdownOSGiRuntime()  {

-        try {

-            OSGiTestRuntime.stop();

-        

-        } catch (Exception e) {

-            // Ignore

-        }

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
deleted file mode 100644
index 1fba0d6dcd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ /dev/null
@@ -1,136 +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.test.util;

-

-

-import java.io.File;

-import java.io.FilenameFilter;

-import java.lang.reflect.Method;

-

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.BundleException;

-

-/**

- * Load Tuscany into an OSGi runtime

- *

- */

-public class TuscanyLoader {

-    

-    private static final String tuscanyInstallerDir = "../tuscany-osgi-installer";

-    private static final String tuscanyInstallerJar = "tuscany-sca-osgi-installer.jar";

-    

-    // 5-bundle version of Tuscany

-    private static final String scaApiDir = "../sca-api";

-    private static final String tuscanySpiDir = "../tuscany-spi";

-    private static final String tuscanyRuntimeDir = "../tuscany-runtime";

-    private static final String tuscanyExtensionsDir = "../tuscany-extensions";

-    private static final String thirdPartyDir = "../tuscany-3rdparty";

-    

-    private static String findBundle(String subDirName, final String jarPrefix) throws Exception {

-        

-        File dir = new File(subDirName + "/target");

-        if (dir.exists() && dir.isDirectory()) {

-            File[] files = dir.listFiles(new FilenameFilter() {

-

-                public boolean accept(File dir, String name) {

-                    return name.endsWith(".jar") && (jarPrefix == null || name.startsWith(jarPrefix));

-                }

-                

-            });

-            

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

-                return files[0].toURI().toURL().toString();

-        }

-        return null;

-    }

-    

-    public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {

-        

-        String tuscanyInstallerBundleName = new File(tuscanyInstallerDir + "/target/" + tuscanyInstallerJar).toURI().toURL().toString();

-        Bundle tuscanyInstallerBundle = bundleContext.installBundle(tuscanyInstallerBundleName); 

-        tuscanyInstallerBundle.start();

-        Bundle[] bundles = bundleContext.getBundles();

-        Bundle tuscanyRuntimeBundle = tuscanyInstallerBundle;

-        for (Bundle bundle : bundles) {

-            if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) {

-                tuscanyRuntimeBundle = bundle;

-                break;

-            }

-        }

-        setThreadContextClassLoader(tuscanyRuntimeBundle);

-        

-        return tuscanyRuntimeBundle;

-    }

-    

-    /**

-     * Load four Tuscany bundles (API, Core-SPI, Runtime, Extensions)  and combined third party bundle

-     * 

-     * @param bundleContext

-     */

-    public static Bundle load5BundleTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {

-        

-

-        String thirdPartyBundleName = findBundle(thirdPartyDir, null);

-        Bundle thirdPartyBundle = bundleContext.installBundle(thirdPartyBundleName);        

-        thirdPartyBundle.start();

-            

-

-        String scaApiBundleName = findBundle(scaApiDir, null);

-        Bundle scaApiBundle = bundleContext.installBundle(scaApiBundleName);            

-        scaApiBundle.start();            

-

-        String tuscanySpiBundleName = findBundle(tuscanySpiDir, null);

-        Bundle tuscanySpiBundle = bundleContext.installBundle(tuscanySpiBundleName);    

-        

-        String tuscanyRuntimeBundleName = findBundle(tuscanyRuntimeDir, null);

-        Bundle tuscanyRuntimeBundle = bundleContext.installBundle(tuscanyRuntimeBundleName);

-        

-        String tuscanyExtensionsBundleName = findBundle(tuscanyExtensionsDir, null);

-        Bundle tuscanyExtensionsBundle = bundleContext.installBundle(tuscanyExtensionsBundleName);

-        

-

-        tuscanySpiBundle.start();      

-        tuscanyExtensionsBundle.start();    

-        

-        setThreadContextClassLoader(tuscanyRuntimeBundle);

-        return tuscanyRuntimeBundle;

-    

-    }

-    

-

-    // Tuscany runtime is started on a different thread when previously cached bundle is used.

-    // Set this thread's TCCL to the one used by the runtime.

-    public static void setThreadContextClassLoader(Bundle tuscanyRuntimeBundle) throws BundleException {

-        if (tuscanyRuntimeBundle != null) {

-            

-            try {

-                Class<?> runtimeClass = tuscanyRuntimeBundle.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime");

-                Method getRuntimeMethod = runtimeClass.getMethod("findRuntime");

-                Object runtime = getRuntimeMethod.invoke(runtimeClass);

-                Method getTCCLMethod = runtimeClass.getMethod("getContextClassLoader");

-                ClassLoader runtimeTCCL = (ClassLoader) getTCCLMethod.invoke(runtime);

-                Thread.currentThread().setContextClassLoader(runtimeTCCL);               

-                

-            } catch (Throwable e) {

-            }

-        }

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
deleted file mode 100644
index ace762bb47..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
+++ /dev/null
@@ -1,119 +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.test.osgi.harness;
-
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.HashSet;
-
-import junit.framework.Assert;
-import junit.framework.TestResult;
-
-import org.apache.tuscany.sca.test.util.TuscanyLoader;
-
-/*
- * Test Tuscany running in an OSGi container
- * This harness runs Tuscany samples outside OSGi with Tuscany running in OSGi
- */
-public class OSGiTuscanyNonOSGiTestHarness extends OSGiTuscanyTestHarness {
-    
-    
-    
-   
-    public void runTest(String... testDirs) throws Exception {
-        
-        String mainTestDir = testDirs[0];
-        
-        File testDir = new File(mainTestDir + "/target/test-classes");
-        if (!testDir.exists()) {
-            System.err.println("Test directory " + testDir + " does not exist");
-            return;
-        }
-
-        System.out.println("Run tests from : " + mainTestDir);
-
-        long startTime = System.currentTimeMillis();
-        
-        
-        String[] dirs = new String[testDirs.length + 2];
-        int i = 0;
-        dirs[i++] = mainTestDir + "/target/test-classes";
-        dirs[i++] = "target/test-classes";
-        for (int j = 0; j < testDirs.length; j++) {
-            dirs[i++] = testDirs[j] + "/target/classes";
-        }
-        
-
-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(getBundleContext());
-        long endTime = System.currentTimeMillis();
-        
-        System.out.println("Loaded Tuscany, time taken = " + (endTime-startTime) + " ms" );
-        
-        URL[] dirURLs = new URL[dirs.length];
-        for (int j = 0; j < dirs.length; j++) {
-            dirURLs[j]  = new File(dirs[j]).toURI().toURL();
-        }
-        ClassLoader testClassLoader = new URLClassLoader(dirURLs, Thread.currentThread().getContextClassLoader());
-        Thread.currentThread().setContextClassLoader(testClassLoader);
-        
-        Class<?> testClass = testClassLoader.loadClass(this.getClass().getName());
-        Method testMethod = testClass.getMethod("runAllTestsFromDirs", ClassLoader.class, String[].class);
-        Object testObject = testClass.newInstance();
-        testMethod.invoke(testObject, testClassLoader, dirs);
-        
-    }
-    
-    public void getTestCases(File dir, String prefix, HashSet<String> testCaseSet) {
-        File[] files = dir.listFiles();
-        for (File file : files) {
-            if (file.isDirectory()) {
-                String newPrefix = prefix == null?file.getName() : prefix + "." + file.getName();
-                getTestCases(file, newPrefix, testCaseSet);
-            } 
-            else if (file.getName().endsWith("TestCase.class")) {
-                String name = file.getName();
-                name = name.substring(0, name.length()-6); // remove .class
-                name = (prefix == null)?name : prefix + "." + name;
-                
-                testCaseSet.add(name);
-            }
-        }
-    }
-    
-
-    public void runAllTestsFromDirs(ClassLoader testClassLoader, String[] testDirs) throws Exception {
-        
-        TestResult testResult = new TestResult();
-        HashSet<String> testCaseSet = new HashSet<String>();
-        for (String testDir : testDirs) {
-            getTestCases(new File(testDir), null, testCaseSet);
-        }
-        for (String className : testCaseSet) {
-            Class testClass = testClassLoader.loadClass(className);
-            runTestCase(testClass, testResult);
-        }    
-        
-        Assert.assertEquals(0, testResult.errorCount());
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
deleted file mode 100644
index 3f3774899d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ /dev/null
@@ -1,320 +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.test.osgi.harness;

-

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import java.io.File;

-import java.io.FileInputStream;

-import java.lang.reflect.Method;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.ArrayList;

-import java.util.Enumeration;

-import java.util.jar.JarOutputStream;

-import java.util.jar.Manifest;

-import java.util.zip.ZipEntry;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-import junit.framework.TestResult;

-

-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;

-import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader;

-import org.apache.tuscany.sca.test.util.TuscanyLoader;

-import org.junit.After;

-import org.junit.AfterClass;

-import org.junit.Before;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-

-/*

- * Test Tuscany running in an OSGi container

- * Harness can be used to run Tuscany samples with Tuscany running in OSGi

- */

-public class OSGiTuscanyTestHarness {

-    

-

-    private OSGiTestRuntime osgiRuntime;

-    protected Bundle tuscanyRuntime;

-    private BundleContext bundleContext;

-    private Bundle testBundle;

-

-    public void setUp() throws Exception {

-        

-        osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime();

-        bundleContext = osgiRuntime.getBundleContext();

-        

-        // Uninstall any previously installed test bundles

-        for (Bundle bundle : bundleContext.getBundles()) {

-            if ("org.apache.tuscany.sca.test.samples".equals(bundle.getSymbolicName())) {

-                bundle.uninstall();

-            }

-        }

-    }

-    

-

-    public void tearDown() throws Exception {

-        if (tuscanyRuntime != null) {

-            tuscanyRuntime.stop();

-        }

-        OSGiRuntimeLoader.shutdownOSGiRuntime();

-    }

-    

-    public BundleContext getBundleContext() {

-        return bundleContext;

-    }

-   

-    public void runTest(String... testDirs) throws Exception {

-        

-        String mainTestDir = testDirs[0];

-        

-        File testDir = new File(mainTestDir + "/target/test-classes");

-        if (!testDir.exists()) {

-            System.err.println("Test directory " + testDir + " does not exist");

-            return;

-        }

-

-        System.out.println("Run tests from : " + mainTestDir);

-

-        long startTime = System.currentTimeMillis();

-        

-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(bundleContext);

-        

-        String[] dirs = new String[testDirs.length + 2];

-        int i = 0;

-        dirs[i++] = mainTestDir + "/target/test-classes";

-        dirs[i++] = "target/test-classes";

-        for (int j = 0; j < testDirs.length; j++) {

-            dirs[i++] = testDirs[j] + "/target/classes";

-        }

-        

-        String manifestFile = "target/test-classes/META-INF/MANIFEST.MF";

-        

-        testBundle = createAndInstallBundle(

-                 "file:" + mainTestDir + "/target/classes",    // Bundle location: used to get File URLs for DefaultSCADomain

-                 manifestFile,                                 // Test bundle manifest file

-                 dirs                                          // Directory entries to be added to bundle

-                 );

-    

-        

-

-        long endTime = System.currentTimeMillis();

-        

-        System.out.println("Loaded Tuscany, time taken = " + (endTime-startTime) + " ms" );

-        

-        testBundle.start();

-        

-        Class<?> testClass = testBundle.loadClass(this.getClass().getName());

-        Method testMethod = testClass.getMethod("runAllTestsFromBundle", Bundle.class);

-        Object testObject = testClass.newInstance();

-        testMethod.invoke(testObject, testBundle);

-        

-        testBundle.stop();

-        testBundle.uninstall();

-    }

-    

-    // Create and install a bundle with the specified manifest file

-    // The bundle contains all files from the list of directories specified

-    public Bundle createAndInstallBundle(String bundleLocation, String manifestFileName,

-            String[] dirNames) throws Exception {

-

-        ByteArrayOutputStream out = new ByteArrayOutputStream();

-

-        File manifestFile = new File(manifestFileName);

-        Manifest manifest = new Manifest();

-        manifest.read(new FileInputStream(manifestFile));

-        manifest.getMainAttributes().putValue("Bundle-Version", (String)tuscanyRuntime.getHeaders().get("Bundle-Version"));

-

-        JarOutputStream jarOut = new JarOutputStream(out, manifest);

-        

-        for (int i = 0; i < dirNames.length; i++) {

-            File dir = new File(dirNames[i]);

-            addFilesToJar(dir, dirNames[i], jarOut);

-        }

-

-        jarOut.close();

-        out.close();

-

-        ByteArrayInputStream inStream = new ByteArrayInputStream(out.toByteArray());

-        return bundleContext.installBundle(bundleLocation, inStream);

-

-    }

-     

-    // Add all the files from a build directory into a jar file

-    // This method is used to create bundles on the fly

-    private void addFilesToJar(File dir, String rootDirName, JarOutputStream jarOut) throws Exception {

-        

-        if (dir.getName().equals(".svn"))

-            return;

-        

-        File[] files = dir.listFiles();

-        

-        if (files == null)

-            return;

-

-        for (int i = 0; i < files.length; i++) {

-

-            if (files[i].isDirectory()) {

-                addFilesToJar(files[i], rootDirName, jarOut);

-            }

-            if (files[i].getName().endsWith("MANIFEST.MF"))

-                continue;

-

-            String entryName = files[i].getPath().substring(rootDirName.length()+1);

-            entryName = entryName.replaceAll("\\\\", "/");

-            if (files[i].isDirectory()) {

-                entryName += "/";

-            }

-            ZipEntry ze = new ZipEntry(entryName);

-

-            try {

-                jarOut.putNextEntry(ze);

-                FileInputStream file = new FileInputStream(files[i]);

-                byte[] fileContents = new byte[file.available()];

-                file.read(fileContents);

-                jarOut.write(fileContents);

-            } catch (Exception e) {

-                // Ignore duplicate entry errors 

-            }

-        }

-    }

-    

-

-    public void runAllTestsFromBundle(Bundle bundle) throws Exception {

-        

-        TestResult testResult = new TestResult();

-        Enumeration entries = bundle.findEntries("/", "*TestCase.class", true);

-        while (entries.hasMoreElements()) {

-            URL entry = (URL)entries.nextElement();

-            String className = entry.getFile();

-            className = className.substring(1, className.length()-6); // remove leading / and trailing .class

-            className = className.replaceAll("/", ".");

-            Class testClass = bundle.loadClass(className);

-            runTestCase(testClass, testResult);

-        }    

-        

-        Assert.assertEquals(0, testResult.errorCount());

-

-    }

-    

-

-    public void runTestCase(Class testClass, TestResult testResult) throws Exception {

-        

-        boolean isJunitTest = TestCase.class.isAssignableFrom(testClass);

-        if (testClass.getName().endsWith("TestCase") &&

-                    !testClass.getPackage().getName().startsWith("org.apache.tuscany.sca.test.osgi")) {

-            Object test = (Object)testClass.newInstance();

-

-            System.out.println("Running test " + test + " ");

-            int ran = 0;

-            int failed = 0;

-            ArrayList<Method> testMethods = new ArrayList<Method>();

-            Method setupMethod = null;

-            Method tearDownMethod = null;

-            Method setupClassMethod = null;

-            Method tearDownClassMethod = null;

-            Method[] methods = testClass.getDeclaredMethods();

-            for (final Method method : methods) {

-                if ((isJunitTest && method.getName().startsWith("test"))

-                        || method.getAnnotation(Test.class) != null) {

-                    testMethods.add(method);

-

-                } else if ((isJunitTest && method.getName().equals("setUp"))

-                        || method.getAnnotation(Before.class) != null) {

-

-                    setupMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                } else if ((isJunitTest && method.getName().equals("tearDown"))

-                        || method.getAnnotation(After.class) != null) {

-

-                    tearDownMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                } else if (method.getAnnotation(BeforeClass.class) != null) {

-

-                    setupClassMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                } else if (method.getAnnotation(AfterClass.class) != null) {

-

-                    tearDownClassMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                }

-            }

-            try {

-                if (setupClassMethod != null)

-                    setupClassMethod.invoke(null);

-                for (Method testMethod : testMethods) {

-

-                    ran++;

-                    failed++;

-                    try {

-                        if (setupMethod != null)

-                            setupMethod.invoke(test);

-

-                        testMethod.invoke(test);

-                        failed--;

-

-                    } catch (Exception e) {

-                        e.printStackTrace();

-                        throw e;

-                    } finally {

-                        if (tearDownMethod != null)

-                            tearDownMethod.invoke(test);

-                    }

-                }

-            } catch (Exception e) {

-                e.printStackTrace();

-                throw e;

-            } finally {

-

-                System.out.println("Ran: " + ran + ", Passed: " + (ran - failed) + ", Failed: " + failed);

-                if (tearDownClassMethod != null)

-                    tearDownClassMethod.invoke(null);

-            }

-        }    

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
deleted file mode 100644
index 85397195bd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ /dev/null
@@ -1,61 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-calculator-implementation-policies

- */

-public class CalculatorImplementationPoliciesTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "calculator-implementation-policies");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
deleted file mode 100644
index 9346fb8ed2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ /dev/null
@@ -1,62 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-calculator-rmi-reference and samples-calculator-rmi-service

- */

-public class CalculatorRmiTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "calculator-rmi-reference");

-        testHarness.runTest("../../../samples/" + "calculator-rmi-service");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
deleted file mode 100644
index 501cded48d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ /dev/null
@@ -1,63 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-calculator-script

- */

-public class CalculatorScriptTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-

-        System.setProperty("python.cachedir", "target/cachedir");

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "calculator-script");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
deleted file mode 100644
index 832e28ef91..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ /dev/null
@@ -1,63 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.Ignore;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-callback-ws

- */

-public class CallbackWsClientTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    @Ignore("TUSCANY-2409")

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "callback-ws-client", 

-                "../../../samples/" + "callback-ws-service");

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
deleted file mode 100644
index d350cf378f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ /dev/null
@@ -1,63 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.Ignore;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-callback-ws

- */

-public class CallbackWsServiceTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    @Ignore("TUSCANY-2409")

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "callback-ws-service");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
deleted file mode 100644
index 4f5640960b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ /dev/null
@@ -1,61 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-helloworld-ws-service-jms

- */

-public class HelloworldWsServiceJmsTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "helloworld-ws-service-jms");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
deleted file mode 100644
index 9a491304bf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ /dev/null
@@ -1,61 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-helloworld-ws-service-secure

- */

-public class HelloworldWsServiceSecureTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "helloworld-ws-service-secure");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
deleted file mode 100644
index 2e0b49e693..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ /dev/null
@@ -1,61 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-helloworld-ws-service

- */

-public class HelloworldWsServiceTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "helloworld-ws-service");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
deleted file mode 100644
index a3b77aa77b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ /dev/null
@@ -1,85 +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.test.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyNonOSGiTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- * 
- * Run samples which use old domain code
- */
-public class NonOSGiSamplesTestCase {
-    
-    
-    private static String[] SAMPLES = {
-        "binding-notification-consumer",
-        "binding-notification-producer",
-        "calculator",
-        "implementation-composite",
-        "implementation-notification", 
-        "loanapplication", 
-        "simple-bigbank", 
-        "simple-callback",
-        "supplychain",
-        "calculator-implementation-policies",
-        "calculator-rmi-reference",
-        "calculator-rmi-service",
-        //"callback-ws-service",
-        "helloworld-ws-service-jms",
-        "helloworld-ws-service-secure",
-        "helloworld-ws-service"
-        
-    };
-    
-
-    private OSGiTuscanyNonOSGiTestHarness testHarness;
-
-    @Before
-    public void setUp() throws Exception {
-        
-        testHarness = new OSGiTuscanyNonOSGiTestHarness();
-        testHarness.setUp();
-    }
-    
-
-    @After
-    public void tearDown() throws Exception {
-
-        if (testHarness != null) {
-            testHarness.tearDown();
-            testHarness = null;
-        }
-    }
-    
-
-    @Test
-    public void runTestsOutsideOSGi() throws Exception {
-        
-        for (String testDir : SAMPLES) {
-            testHarness.runTest("../../../samples/" + testDir);
-        }
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
deleted file mode 100644
index 62c0eef16d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ /dev/null
@@ -1,71 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-osgi-supplychain

- */

-public class OSGiSupplyChainTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        BundleContext bundleContext = testHarness.getBundleContext();

-        if (bundleContext != null) {

-            Bundle[] bundles = bundleContext.getBundles();

-            for (Bundle bundle : bundles) {

-                if (bundle.getSymbolicName() != null && bundle.getSymbolicName().contains("supplychain"))

-                    bundle.uninstall();

-            }

-        }

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "osgi-supplychain");

-        

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
deleted file mode 100644
index 155dd368a3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ /dev/null
@@ -1,137 +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.test.osgi.tuscany;

-

-

-import java.io.File;

-import java.lang.reflect.Method;

-import java.net.URL;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;

-import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader;

-import org.apache.tuscany.sca.test.util.TuscanyLoader;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceReference;

-

-/*

- * Test Tuscany running inside OSGi

- */

-public class OSGiTuscanyRuntimeTestCase {

-    

-    private OSGiTestRuntime osgiRuntime;

-    private Bundle tuscanyRuntime;

-    

-

-    @Before

-    public void setUp() throws Exception {

-        

-        osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime();

-        BundleContext bundleContext = osgiRuntime.getBundleContext();

-        

-        // Uninstall any previously installed test bundles

-        for (Bundle bundle : bundleContext.getBundles()) {

-            String bundleName = bundle.getSymbolicName();

-            if (bundleName != null && 

-               (bundleName.equals("org.apache.tuscany.sca.test.samples")||

-               bundleName.startsWith("supplychain"))) {

-                  bundle.uninstall();

-            }

-        }

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (tuscanyRuntime != null) {

-            tuscanyRuntime.stop();

-        }

-        OSGiRuntimeLoader.shutdownOSGiRuntime();

-    }

-

-   

-    

-    @Test

-    public void startTuscanyRuntimeInOSGi() throws Exception {

-        

-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext());

-        Assert.assertNotNull(tuscanyRuntime);

-        Bundle[] bundles = osgiRuntime.getBundleContext().getBundles();

-        Bundle runtimeBundle = null;

-        for (Bundle bundle : bundles) {

-            if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) {

-                runtimeBundle = bundle;

-                break;

-            }

-        }

-        Assert.assertNotNull(runtimeBundle);

-        Class<?> clazz = runtimeBundle.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime");

-        Assert.assertNotNull(clazz);

-               

-    }

-    

-    @Test

-    public void testOSGiTuscany_ImplementationJava() throws Exception {

-        testOSGiTuscanyUsingOSGiClient("SupplyChain.jar");

-    }

-    

-    @Test

-    public void testOSGiTuscany_BindingWS() throws Exception {

-        testOSGiTuscanyUsingOSGiClient("SupplyChainWS.jar");

-    }

-   

-    

-    private void testOSGiTuscanyUsingOSGiClient(String contributionJarName) throws Exception {

-        

-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext());

-        

-        String folderName = "../test-bundles/target/"; 

-        String supplychainJarName = contributionJarName;

-        String supplychainClientJarName = "SupplyChainClient.jar";

-        URL supplyChainURL = new File(folderName + supplychainJarName).toURI().toURL();        

-        URL supplyChainClientURL = new File(folderName + supplychainClientJarName).toURI().toURL();

-    

-        Bundle supplyChainBundle = osgiRuntime.getBundleContext().installBundle(supplyChainURL.toString());

-        supplyChainBundle.start();

-        Bundle clientBundle = osgiRuntime.getBundleContext().installBundle(supplyChainClientURL.toString());

-        clientBundle.start();

-        

-        String clientClassName = "supplychain.client.SupplyChainClient";

-        Class<?> clientClass = clientBundle.loadClass(clientClassName);

-        ServiceReference testServiceRef = clientBundle.getBundleContext().getServiceReference(clientClassName);

-        Object testService = clientBundle.getBundleContext().getService(testServiceRef);

-        

-        Method m = clientClass.getMethod("runTest", String.class);

-        m.invoke(testService, contributionJarName);

-        

-        System.out.println("OSGi Client test completed successfully.");

-        

-        supplyChainBundle.uninstall();

-        clientBundle.uninstall();

-    }

-    

-   

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
deleted file mode 100644
index b45c062761..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
+++ /dev/null
@@ -1,93 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples which use provide Tuscany extensions

- */

-public class TuscanySampleExtensionsTestCase {

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-            testHarness = null;

-        }

-    }

-    

-

-    @Test

-    public void testBindingEchoExtension() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "binding-echo-extension");

-    }

-    

-    @Test

-    public void testBindingEcho() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "binding-echo", "../../../samples/" + "binding-echo-extension");

-

-    }

-    

-    @Test

-    public void testDataBindingEcho() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "databinding-echo", "../../../samples/" + "binding-echo-extension");

-

-    }

-    

-    @Test

-    public void testImplementationCrudExtension() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "implementation-crud-extension");

-    }

-    

-    @Test

-    public void testImplementationCrud() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "implementation-crud", "../../../samples/" + "implementation-crud-extension");

-

-    }

-    

-    @Test

-    public void testImplementationPojoExtension() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "implementation-pojo-extension");

-    }

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
deleted file mode 100644
index c2dae9eb97..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ /dev/null
@@ -1,80 +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.test.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples which use old domain code

- */

-public class TuscanySamplesUsingOldDomainTestCase {

-    

-    

-    private static String[] SAMPLES = {

-                

-        "binding-notification-consumer",

-        "binding-notification-producer",

-        "calculator",

-        "implementation-composite",

-        "implementation-notification", 

-        "loanapplication", 

-        "quote-xquery",

-        "simple-bigbank", 

-        "simple-callback",

-        "supplychain"

-        

-    };

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-            testHarness = null;

-        }

-    }

-    

-

-    @Test

-    public void runTestsUsingOldDomainCode() throws Exception {

-        

-        for (String testDir : SAMPLES) {

-            testHarness.runTest("../../../samples/" + testDir);

-        }

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 8985947286..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: tuscany.sca.samples

-Bundle-SymbolicName: org.apache.tuscany.sca.test.samples

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, 

-  junit.framework, 

-  org.junit,

-  org.apache.tuscany.sca.host.embedded,

-  org.osoa.sca,

-  org.osoa.sca.annotations,

-  org.apache.tuscany.sca.databinding.annotation

-DynamicImport-Package: *

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
deleted file mode 100644
index 6a38f48c4a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ /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.    

-#

-#

-# Framework config properties.

-#

-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \

- org.osgi.service.packageadmin; version=1.2.0, \

- org.osgi.service.startlevel; version=1.0.0, \

- org.osgi.service.url; version=1.0.0 \

- org.osgi.util.tracker; version=1.3.2 

-

-

-felix.auto.start.1= \   

-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" 

-    

-# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 

-# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \

-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \

-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \

-

-

-felix.startlevel.framework=1

-felix.startlevel.bundle=1

-

-#

-# Bundle config properties.

-#

-org.osgi.service.http.port=8080

-obr.shell.telnet=on

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/pom.xml
deleted file mode 100644
index 1a4d5c6084..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/pom.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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-osgi-tuscany</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany OSGi-based Tuscany Runtime Integration Tests</name>

-

-    <modules>

-        <module>test-bundles</module>

-        <module>tuscany-osgi-installer</module>

-        <module>osgi-tuscany-test</module>

-    </modules>

-    

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/sca-api/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/sca-api/pom.xml
deleted file mode 100644
index 80b945499b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/sca-api/pom.xml
+++ /dev/null
@@ -1,60 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-sca-api</artifactId>
-    <name>Apache Tuscany OSGi - SCA API Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.api</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA API Bundle</Bundle-Description>
-                        <Export-Package>org.osoa.sca*;version="2.0"</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/build-bundles.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/build-bundles.xml
deleted file mode 100644
index c7ea66863f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/build-bundles.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.

--->

-<project name="OSGiBundleCreator">

-

-    <target name="create-bundles">

-

-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >

-            <fileset dir="${files.dir}" includes="${files.list}">

-            </fileset>

-        </jar>

-    </target>

-

-

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/pom.xml
deleted file mode 100644
index c54abf37a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-test-bundles</artifactId>
-    <name>Apache Tuscany OSGi-Based Tuscany Runtime Test Bundles</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-
-    </dependencies>
-
-    <build>
-        <finalName>itest-osgi-tuscany-test-bundles</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-bundles</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChain.jar" />
-                                    <property name="manifest.file.name" value="META-INF/SupplyChain.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/retailer/* \
-                                               supplychain/warehouse/* \
-                                               supplychain/shipper/* \
-                                               supplychain/supplychain.composite \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChainClient.jar" />
-                                    <property name="manifest.file.name" value="META-INF/SupplyChainClient.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/client/*" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChainWS.jar" />
-                                    <property name="manifest.file.name" value="META-INF/SupplyChain.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/retailer/* \
-                                               supplychain/warehouse/* \
-                                               supplychain/shipper/* \
-                                               supplychain/ws/supplychain.composite \
-                                               supplychain/ws/Customer.wsdl \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
deleted file mode 100644
index 0ac96b35a3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ /dev/null
@@ -1,115 +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 supplychain.client;

-

-

-import java.io.File;

-import java.net.URL;

-import java.util.Hashtable;

-

-

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

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-

-

-import supplychain.customer.Customer;

-

-/**

- * SupplyChain test client

- */

-public class SupplyChainClient implements BundleActivator {

-

-    private EmbeddedSCADomain scaDomain;

-    private Customer customer;

-    

-    

-

-    public void start(BundleContext context) throws Exception {

-        

-        context.registerService(SupplyChainClient.class.getName(), this, new Hashtable());

-        

-    }

-

-    public void stop(BundleContext context) throws Exception {

-        

-    }

-

-    protected void setUp(String contributionJarName) throws Exception {

-        

-        scaDomain = new EmbeddedSCADomain(EmbeddedSCADomain.class.getClassLoader(), "http://localhost");

-        scaDomain.start();

-        ContributionService contributionService = scaDomain.getContributionService();

-        String folderName = "../test-bundles/target/"; 

-        String supplychainJarName = contributionJarName;

-        URL supplyChainURL = new File(folderName + supplychainJarName).toURI().toURL();

-        

-        Contribution contribution = contributionService.contribute("SupplyChain", supplyChainURL, false);

-        for (Composite deployable : contribution.getDeployables() ) {

-            scaDomain.getDomainComposite().getIncludes().add(deployable);

-            scaDomain.buildComposite(deployable);

-        }

-        

-        for (Composite deployable : contribution.getDeployables() ) {

-            scaDomain.getCompositeActivator().activate(deployable);

-            scaDomain.getCompositeActivator().start(deployable);

-        }

-        customer = scaDomain.getService(Customer.class, "CustomerComponent");

-    }

-    

-    protected void tearDown() throws Exception {

-        if (scaDomain != null) {

-            scaDomain.close();

-            scaDomain = null;

-        }

-    }

-

-

-    public void runTest(String contributionJarName) throws Exception {

-        

-        try {

-            setUp(contributionJarName);

-            customer.purchaseGoods();

-            int retries = 10;

-            int outstandingCount = 1;

-            while (retries-- > 0) {

-

-                outstandingCount = customer.outstandingOrderCount();

-                if (outstandingCount == 0)

-                    break;

-                else

-                    Thread.sleep(100);

-            }

-            if (outstandingCount != 0)

-                throw new RuntimeException("Orders not processed on time");

-            

-        } finally {

-            

-            tearDown();

-        }    

-        

-        

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index a3aa2531fc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
+++ /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.    

- */

-package supplychain.customer;

-

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

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

-

-/**

- * This is the business interface of the Customer service component.

- */

-@Remotable

-public interface Customer {

-    

-    public void purchaseGoods();

-    

-    @OneWay

-    public void notifyShipment(String order);

-    

-    public int outstandingOrderCount();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 5f1342c40b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,61 +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 supplychain.customer;

-

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

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

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

-

-import supplychain.retailer.Retailer;

-

-/**

- * This class implements the Customer service component (POJO implementation).

- */

-@Service(Customer.class)

-@Scope("COMPOSITE")

-public class JavaCustomerComponentImpl implements Customer {

-    

-    private static int outstandingOrderCount;

-    

-    private Retailer retailer;

-    

-    public JavaCustomerComponentImpl() {

-    }

-    

-    @Reference

-    public void setRetailer(Retailer retailer) {

-        this.retailer = retailer;

-    }

-    

-    public void purchaseGoods() {

-        outstandingOrderCount++;

-        retailer.submitOrder("Order");

-    }

-    

-    public void notifyShipment(String order) {

-        outstandingOrderCount--;

-        System.out.print("Work thread " + Thread.currentThread() + " - ");

-        System.out.println(order);

-    }

-    

-    public int outstandingOrderCount() {

-        return outstandingOrderCount;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index f5708dec40..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.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 supplychain.retailer;

-

-

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

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

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

-

-import supplychain.warehouse.Warehouse;

-

-/**

- * This class implements the Retailer service component (POJO implementation).

- */

-@Service(Retailer.class)

-@Scope("STATELESS")

-public class JavaRetailerComponentImpl implements Retailer {

-    

-    private Warehouse warehouse;

-    

-    public JavaRetailerComponentImpl() {

-    }

-    

-    @Reference

-    public void setWarehouse(Warehouse warehouse) {

-        this.warehouse = warehouse;

-    }

-    

-     

-    public Warehouse getWarehouse() {

-        return warehouse;

-    }

-

-    public void submitOrder(String order) {

-        

-        warehouse.fulfillOrder(order + ", submitted");

-        

-    }

-

-    

-    

-   

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 17b342f8dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.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 supplychain.retailer;

-

-/**

- * This is the business interface of the Retailer service component.

- */

-public interface Retailer {

-    

-    public void submitOrder(String order);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index afaf7aea02..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,50 +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 supplychain.shipper;

-

-

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

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

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

-

-import supplychain.customer.Customer;

-

-/**

- * This class implements the Shipper service component (POJO implementation).

- */

-@Service(Shipper.class)

-@Scope("COMPOSITE")

-public class JavaShipperComponentImpl implements Shipper {

-    

-    private Customer customer;

-    

-    public JavaShipperComponentImpl() {

-    }

-    

-    @Reference

-    public void setCustomer(Customer customer) {

-        this.customer = customer;

-    }

-    

-    public void processShipment(String order) {

-        customer.notifyShipment(order + ", shipped");

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index cd204ebc2e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.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 supplychain.shipper;

-

-/**

- * This is the business interface of the Shipper service component.

- */

-public interface Shipper {

-    

-    public void processShipment(String order);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index ca720085c5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,49 +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 supplychain.warehouse;

-

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

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

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

-

-import supplychain.shipper.Shipper;

-

-/**

- * This class implements the Warehouse service component (POJO implementation).

- */

-@Service(Warehouse.class)

-@Scope("STATELESS")

-public class JavaWarehouseComponentImpl implements Warehouse {

-    

-    private Shipper shipper;

-    

-    public JavaWarehouseComponentImpl() {

-    }

-    

-    @Reference

-    public void setShipper(Shipper shipper) {

-        this.shipper = shipper;

-    }

-    

-    public void fulfillOrder(String order) {

-        shipper.processShipment(order + ", fulfilled");

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index b4807b80d1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.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 supplychain.warehouse;

-

-/**

- * This is the business interface of the Warehouse service component.

- */

-public interface Warehouse {

-    

-    public void fulfillOrder(String order);

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
deleted file mode 100644
index 249d42858e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChain

-Bundle-SymbolicName: supplychain.SupplyChain

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                org.osoa.sca,

-                org.osoa.sca.annotations

-Export-Package: supplychain.customer, supplychain

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
deleted file mode 100644
index 9f13b1e9a6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChainClient

-Bundle-SymbolicName: supplychain.SupplyChainClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, 

-        supplychain.customer, supplychain,

-        org.apache.tuscany.sca.host.embedded,

-        org.apache.tuscany.sca.host.embedded.impl,

-        org.apache.tuscany.sca.assembly,

-        org.apache.tuscany.sca.contribution,

-        org.apache.tuscany.sca.contribution.service,

-        org.apache.tuscany.sca.core.assembly,

-        org.apache.tuscany.sca.assembly.builder,

-        org.osoa.sca,

-        org.osoa.sca.annotations

-Export-Package: supplychain.client

-Bundle-Activator: supplychain.client.SupplyChainClient

-

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b524abc2a6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://supplychain"

-              xmlns:supplychain="http://supplychain">

-              

-   <deployable composite="supplychain:supplychain"/>

-   

-</contribution>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ /dev/null
@@ -1,48 +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://www.osoa.org/xmlns/sca/1.0"

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

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
deleted file mode 100644
index 8549ca3409..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ /dev/null
@@ -1,135 +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://supplychain"
-  xmlns:axis2ns1="http://supplychain"
-  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-  xmlns:ns1="http://supplychain"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <xs:schema attributeFormDefault="unqualified"
-      elementFormDefault="qualified"
-      targetNamespace="http://supplychain"
-      xmlns:ns="http://supplychain" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="outstandingOrderCount">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="outstandingOrderCountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" type="xs:int"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="notifyShipment">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="param0" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="notifyShipmentResponse">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="purchaseGoods">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="purchaseGoodsResponse">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="outstandingOrderCountRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:outstandingOrderCount" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="outstandingOrderCountResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:outstandingOrderCountResponse" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="notifyShipmentRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:notifyShipment" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="notifyShipmentResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:notifyShipmentResponse" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="purchaseGoodsRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:purchaseGoods" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="purchaseGoodsResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:purchaseGoodsResponse" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:portType name="Customer" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:operation name="outstandingOrderCount" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input message="axis2ns1:outstandingOrderCountRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-      <wsdl:output
-        message="axis2ns1:outstandingOrderCountResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-    </wsdl:operation>
-    <wsdl:operation name="notifyShipment" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input message="axis2ns1:notifyShipmentRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-    </wsdl:operation>
-    <wsdl:operation name="purchaseGoods" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input message="axis2ns1:purchaseGoodsRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-      <wsdl:output message="axis2ns1:purchaseGoodsResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="CustomerBinding" type="axis2ns1:Customer" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <soap:binding style="document"
-      transport="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-    <wsdl:operation name="outstandingOrderCount" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:operation soapAction="urn:outstandingOrderCount"
-        style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      <wsdl:input xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:input>
-      <wsdl:output xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="notifyShipment" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:operation soapAction="urn:notifyShipment" style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      <wsdl:input xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:input>
-    </wsdl:operation>
-    <wsdl:operation name="purchaseGoods" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:operation soapAction="urn:purchaseGoods" style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      <wsdl:input xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:input>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:service name="CustomerWebService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:port binding="axis2ns1:CustomerBinding"
-      name="CustomerPort" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:address
-        location="http://localhost:8085/services/Customer" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-    </wsdl:port>
-  </wsdl:service>
-  
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
deleted file mode 100644
index 88d1e72efc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"

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

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-        <service name="Customer">

-             <interface.wsdl interface="http://supplychain#wsdl.interface(Customer)" />

-            <binding.ws wsdlElement="http://supplychain#wsdl.port(CustomerWebService/CustomerPort)"/>

-        </service>

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer">

-            <interface.wsdl interface="http://supplychain#wsdl.interface(Customer)" />

-            <binding.ws wsdlElement="http://supplychain#wsdl.port(CustomerWebService/CustomerPort)"/>

-        </reference>

-    </component>

-   

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-3rdparty/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
deleted file mode 100644
index ec74a4c56c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
+++ /dev/null
@@ -1,324 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-3rdparty</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany 3rdParty Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-feed-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>6.1.7</version>
-        </dependency>
-  
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.3rdparty</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA 3rd party Bundle</Bundle-Description>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Embed-Dependency>
-                            tuscany-sdo*,
-                            tuscany-das*,
-                            !tuscany*
-                        </Embed-Dependency>
-                        <_exportcontents>
-                            !org.apache.tuscany.sca*,
-                            !org.osoa.sca*,
-                            org.mortbay*;version="6.1.7",
-                            commonj.sdo*;version="2.1.0",
-                            *
-                        </_exportcontents>
-                        <Import-Package>*;resolution:=optional</Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-extensions/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-extensions/pom.xml
deleted file mode 100644
index 819b387c9f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-extensions/pom.xml
+++ /dev/null
@@ -1,348 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-tuscany-extensions</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany Extensions Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-data-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-engine-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.extensions</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA Extensions Bundle</Bundle-Description>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Dependency>tuscany*</Embed-Dependency>
-                        <_exportcontents>
-                            org.apache.tuscany.sca.*;version="2.0"
-                        </_exportcontents>
-                        <Import-Package>*;version="0"</Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
deleted file mode 100644
index 5d1ec6163c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ /dev/null
@@ -1,651 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-installer</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany Installer Bundle</name>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <tuscany.version>${pom.version}</tuscany.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-fileupload</groupId>
-                    <artifactId>commons-fileupload</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-console</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-optional</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web-demo</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-jaas</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jsp_2.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>servlet-api-2.5</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>activesoap</groupId>
-                    <artifactId>jaxp-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>activemq</groupId>
-                    <artifactId>jmdns</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jrms</groupId>
-                    <artifactId>jrms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xmlParserAPIs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xmlpull</groupId>
-                    <artifactId>xmlpull</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j-remote</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>  
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>groovy</groupId>
-                    <artifactId>groovy-all-minimal</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-java2wsdl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-wsdl2java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>        
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.0</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-               </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-        </dependency>
-     </dependencies>
-   
-
-    <build>
-
-        <plugins>
-
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <cpFile>${project.build.directory}/classes/org/apache/tuscany/sca/installer/.classpath</cpFile>
-                    <includeScope>runtime</includeScope>
-                </configuration>
-                 <executions>
-                     <execution>
-                         <id>build-classpath</id>
-                         <phase>compile</phase>
-                         <goals>
-                             <goal>build-classpath</goal>
-                         </goals>
-                     </execution>
-                 </executions>
-            </plugin>
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <finalName>tuscany-sca-osgi-installer</finalName>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                        <manifestEntries>
-                            
-                            <Bundle-Version>2.0</Bundle-Version>
-                            <Bundle-SymbolicName>org.apache.tuscany.sca.installer</Bundle-SymbolicName>
-                            <Bundle-Description>${pom.name}</Bundle-Description>
-                            <Import-Package>org.osgi.framework</Import-Package>
-                            <Export-Package>org.apache.tuscany.sca.installer</Export-Package>
-                            <Bundle-Activator>org.apache.tuscany.sca.installer.InstallerBundleActivator</Bundle-Activator>
-kage>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
deleted file mode 100644
index 2366acd094..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ /dev/null
@@ -1,461 +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.installer;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.CodeSource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * Bundle activator which installs Tuscany modules and 3rd party jars into an OSGi runtime.
- *
- */
-public class InstallerBundleActivator implements BundleActivator {
-    
-    private static final String TUSCANY_INSTALLER_JAR = "tuscany-sca-osgi-installer.jar";
-    private static final String TUSCANY_CLASSPATH = "org/apache/tuscany/sca/installer/.classpath";
-
-    private static final String TUSCANY_OSGI_MANIFEST_DIR = "org/apache/tuscany/sca/manifest";
-    
-    private ArrayList<Bundle> tuscanyBundles = new ArrayList<Bundle>();
-    
-    private static final String[] immutableJars = {
-        "bcprov"
-    };
-    
-    private static final String[] tuscanyModulesToIgnore = {
-        "node2-launcher-webapp",
-        "implementation-node-runtime", // uses node2
-        "saxon",
-        "runtime",
-        "runtime-webapp",
-        "runtime-tomcat",
-        "runtime-war",
-        "host-webapp",
-        "host-tomcat",
-        "policy-transaction",
-        "implementation-bpel",
-        "binding-ejb",
-        "implementation-ejb",
-        "implementation-ejb-xml",
-        
-    };
-    
-	public void start(BundleContext bundleContext) throws Exception {
-		
-        installTuscanyIntoOSGi(bundleContext);
-	}
-
-	public void stop(BundleContext bundleContext) throws Exception {
-        
-        for (Bundle bundle : tuscanyBundles) {
-            try {
-                bundle.stop();
-            } catch (Exception e) {
-                // Ignore error
-            }
-        }
-	}
-	
-    private void installTuscanyIntoOSGi(BundleContext bundleContext) {
-    
-        try {
-            Bundle[] installedBundles = bundleContext.getBundles();
-            HashSet<String> installedBundleSet = new HashSet<String>();
-            for (Bundle bundle : installedBundles) {
-                if (bundle.getSymbolicName() != null)
-                    installedBundleSet.add(bundle.getSymbolicName());
-            }
-            
-            // FIXME: SDO bundles dont have the correct dependencies
-            System.setProperty("commonj.sdo.impl.HelperProvider", "org.apache.tuscany.sdo.helper.HelperProviderImpl");
-            
-            HashSet<File> tuscanyJars = new HashSet<File>();
-            HashMap<File, InputStream> thirdPartyJarsWithManifests = new HashMap<File, InputStream>();
-            HashSet<File> thirdPartyJars = new HashSet<File>();
-            
-            findJars(bundleContext, tuscanyJars, thirdPartyJars, thirdPartyJarsWithManifests);
-            File tuscanyInstallDir = findTuscanyInstallDir(bundleContext.getBundle());
-            
-            for (File bundleFile : thirdPartyJarsWithManifests.keySet()) {
-                                
-                String bundleLocation = bundleFile.toURI().toURL().toString();
-                InputStream bundleManifestStream = thirdPartyJarsWithManifests.get(bundleFile);
-                HashSet<File> jarSet = new HashSet<File>();
-                jarSet.add(bundleFile);
-                
-                File realBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca."+bundleFile.getName());
-                if (realBundleFile.exists()) 
-                    bundleContext.installBundle(realBundleFile.toURI().toURL().toString());
-                else                
-                    createAndInstallBundle(bundleContext, bundleLocation, realBundleFile, bundleManifestStream, jarSet);
-                bundleManifestStream.close();
-                
-            }
-            
-            for (File bundleFile : thirdPartyJars) {
-                
-                String bundleName = bundleFile.getName();
-                if (bundleName.startsWith("org.apache.felix"))
-                    continue;
-                
-                String bundleSymbolicName = "org.apache.tuscany.sca.3rdparty." + bundleName;
-                if (bundleSymbolicName.endsWith(".jar")) bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length()-4);
-                if (installedBundleSet.contains(bundleSymbolicName))
-                    continue;
-                
-                String bundleLocation = bundleFile.toURI().toURL().toString();
-                InputStream bundleManifestStream = createBundleManifest(bundleFile, bundleSymbolicName);
-                HashSet<File> jarSet = new HashSet<File>();
-                jarSet.add(bundleFile);
-
-                File realBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca."+bundleFile.getName());
-                if (realBundleFile.exists()) 
-                    bundleContext.installBundle(realBundleFile.toURI().toURL().toString());
-                else 
-                    createAndInstallBundle(bundleContext, bundleLocation, realBundleFile, bundleManifestStream, jarSet);
-                bundleManifestStream.close();
-               
-            }
-            
-            Bundle osgiRuntimeBundle = null;
-            for (File bundleFile : tuscanyJars) {
-                Bundle bundle = bundleContext.installBundle(bundleFile.toURI().toURL().toString());
-                if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) 
-                    osgiRuntimeBundle = bundle;
-            }
-            if (osgiRuntimeBundle != null)
-                osgiRuntimeBundle.start();
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-        
-    private void findJars(BundleContext bundleContext, 
-            HashSet<File> tuscanyJars, 
-            HashSet<File> thirdPartyJars, 
-            HashMap<File, InputStream> thirdPartyBundleManifests) 
-    throws IOException
-    {
-        
-        Bundle installerBundle = bundleContext.getBundle();   
-        File tuscanyInstallDir = findTuscanyInstallDir(installerBundle);
-        
-        URL classPathURL = installerBundle.getResource(TUSCANY_CLASSPATH);
-        InputStream stream = classPathURL.openStream();
-        byte[] classPathBytes = new byte[stream.available()];
-        stream.read(classPathBytes);
-        String classPath = new String(classPathBytes);
-        
-        // Path separator overrides are not supported by older versions of maven
-        String pathSeparator = ":";
-        if (classPath.indexOf(";") > 0) pathSeparator = ";";
-        
-        String[] classPathEntries = classPath.split(pathSeparator);
-        for (String classPathEntry : classPathEntries) {
-            classPathEntry = classPathEntry.trim();
-            File jar = new File(classPathEntry);
-            if (!jar.exists()) {
-                jar = new File(tuscanyInstallDir, jar.getName());
-                if (!jar.exists())
-                    jar = new File(tuscanyInstallDir, "modules" + File.separator + jar.getName());
-                if (!jar.exists())
-                    jar = new File(tuscanyInstallDir, "lib" + File.separator + jar.getName());
-            }
-
-            String jarName = jar.getName();
-            if (!jarName.startsWith("tuscany") || jarName.startsWith("tuscany-sdo") || jarName.startsWith("tuscany-das")) {
-                if (jarName.endsWith(".jar")) {
-                    String manifestName = TUSCANY_OSGI_MANIFEST_DIR + "/" + jarName.substring(0, jarName.length()-4) + ".mf";
-                    InputStream manifestStream;
-                    if ((manifestStream = this.getClass().getClassLoader().getResourceAsStream(manifestName)) != null)
-                        thirdPartyBundleManifests.put(jar, manifestStream);
-                    else
-                        thirdPartyJars.add(jar);
-                }
-            } else {
-                boolean installTuscanyJar = true;
-                for (String name : tuscanyModulesToIgnore) {
-                    if (jarName.startsWith("tuscany-" + name)) {
-                        installTuscanyJar = false;
-                        break;
-                    }
-                }
-                if (installTuscanyJar)
-                    tuscanyJars.add(jar);
-            }
-        }
-        
-        
-    }
-    
-    private File findTuscanyInstallDir(Bundle installerBundle) 
-    throws IOException
-    {
-        String tuscanyDirName;
-        if ((tuscanyDirName = System.getenv("TUSCANY_HOME")) != null) {
-            File tuscanyInstallDir = new File(tuscanyDirName);
-            if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                return tuscanyInstallDir;
-        }
-        if ((tuscanyDirName = System.getProperty("TUSCANY_HOME")) != null) {
-            File tuscanyInstallDir = new File(tuscanyDirName);
-            if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                return tuscanyInstallDir;
-        }
-         
-        String location = installerBundle.getLocation();
-        
-        if (location != null && location.startsWith("file:") && location.endsWith(TUSCANY_INSTALLER_JAR)) {
-            tuscanyDirName = location.substring(5, location.length()-TUSCANY_INSTALLER_JAR.length()); // strip "file:" and installer jar name
-            File tuscanyInstallDir = new File(tuscanyDirName);
-            if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                return tuscanyInstallDir;
-        }
-        if (this.getClass().getProtectionDomain() != null) {
-            CodeSource codeSource = this.getClass().getProtectionDomain().getCodeSource();
-            if (codeSource != null) {
-                try {
-                    File tuscanyInstallDir = new File(codeSource.getLocation().toURI());
-                    if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                        return tuscanyInstallDir;
-                } catch (Exception e) {
-                    // ignore
-                }                     
-            }
-        }
-        return null;
-    }
-    
-    public Bundle createAndInstallBundle(BundleContext bundleContext, 
-            String bundleLocation, 
-            File bundleFile,
-            InputStream manifestStream,
-            final HashSet<File> thirdPartyJars) throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-        
-        StringBuilder bundleClassPath = new StringBuilder(".");
-        for (File jar : thirdPartyJars) {
-            bundleClassPath.append(',');
-            bundleClassPath.append(jar.getName());           
-        }
-        
-        if (thirdPartyJars.size() > 1)
-            manifest.getMainAttributes().putValue("Bundle-ClassPath", bundleClassPath.toString());
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-        
-        String classpath = manifest.getMainAttributes().getValue("Bundle-ClassPath");
-        boolean embed = classpath != null && !classpath.trim().equals(".");
-        for (File jarFile : thirdPartyJars) {
-            if (embed)
-                addFileToJar(jarFile, jarOut);
-            else {
-                copyJar(jarFile, jarOut);
-            }
-        }
-
-        jarOut.close();
-        out.close();
-
-        Bundle bundle;
-        if (System.getenv("TUSCANY_OSGI_DEBUG") != null) {
-            FileOutputStream fileOut = new FileOutputStream(bundleFile);
-            fileOut.write(out.toByteArray());
-            bundle = bundleContext.installBundle(bundleFile.toURL().toString());
-            
-        } else {
-            ByteArrayInputStream inStream = new ByteArrayInputStream(out.toByteArray());
-            bundle = bundleContext.installBundle(bundleLocation, inStream);
-            inStream.close();
-        }
-        return bundle;
-
-    }
-    
-    private void addFileToJar(File file, JarOutputStream jarOut) throws Exception {
-        
-        ZipEntry ze = new ZipEntry(file.getName());
-
-        try {
-            jarOut.putNextEntry(ze);
-            FileInputStream inStream = new FileInputStream(file);
-            byte[] fileContents = new byte[inStream.available()];
-            inStream.read(fileContents);
-            jarOut.write(fileContents);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-
-    private void copyJar(File file, JarOutputStream jarOut) throws Exception {
-        
-        try {
-            JarInputStream jarIn = new JarInputStream(new FileInputStream(file));
-            ZipEntry ze;
-            byte[] readBuf = new byte[1000];
-            int bytesRead;
-            while ((ze = jarIn.getNextEntry()) != null) {
-                if (ze.getName().equals("META-INF/MANIFEST.MF"))
-                    continue;
-                jarOut.putNextEntry(ze);
-                while ((bytesRead = jarIn.read(readBuf)) > 0) {
-                    jarOut.write(readBuf, 0, bytesRead);
-                }
-            }
-            jarIn.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private InputStream createBundleManifest(File jarFile, String bundleSymbolicName) throws Exception {
-        
-        if (!jarFile.exists())
-            return null;
-        JarInputStream jar = new JarInputStream(new FileInputStream(jarFile));
-        Manifest manifest = jar.getManifest();
-        if (manifest == null)
-            manifest = new Manifest();
-        
-        String bundleName = jarFile.getName();
-        boolean isImmutableJar = false;
-        for (String immutableJar : immutableJars) {
-            if (bundleName.startsWith(immutableJar)) {
-                isImmutableJar = true;
-                break;
-            }
-        }
-        Attributes attributes = manifest.getMainAttributes();
-        if (attributes.getValue("Manifest-Version") == null) {
-            attributes.putValue("Manifest-Version", "1.0");
-        }
-        if (isImmutableJar)
-            attributes.putValue("Bundle-ClassPath", bundleName);
-        
-        HashSet<String> packages = getPackagesInJar(bundleName, jar);
-        String version = getJarVersion(bundleName);
-
-        attributes.remove(new Attributes.Name("Require-Bundle"));
-        attributes.remove(new Attributes.Name("Import-Package"));
-        
-        if (attributes.getValue("Bundle-SymbolicName") == null)
-            attributes.putValue("Bundle-SymbolicName", bundleSymbolicName);
-        if (attributes.getValue("Bundle-Version") == null)
-            attributes.putValue("Bundle-Version", version);
-        // Existing export statements in bundles may contain versions, so they should be used as is
-        // SDO exports are not sufficient, and should be changed
-        if (attributes.getValue("Export-Package") == null || bundleName.startsWith("tuscany-sdo-impl")) {
-            attributes.putValue("Export-Package", packagesToString(packages, version));
-            attributes.putValue("Import-Package", packagesToString(packages, null));
-        }
-        
-        attributes.putValue("DynamicImport-Package", "*");       
-        
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        manifest.write(out);
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        out.close();
-               
-        return in;
-        
-    }
-    
-    private HashSet<String> getPackagesInJar(String bundleName, JarInputStream jar) throws Exception {
-        HashSet<String> packages = new HashSet<String>();
-        ZipEntry entry;
-        while ((entry = jar.getNextEntry()) != null) {
-            String entryName = entry.getName();
-            if (!entry.isDirectory() && entryName != null && entryName.length() > 0 && 
-                    !entryName.startsWith(".") && !entryName.startsWith("META-INF") &&
-                    entryName.lastIndexOf("/") > 0) {
-                String pkg = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.');
-                packages.add(pkg);
-                
-            }
-        }
-        // FIXME: Split package
-        if (bundleName.startsWith("axis2-adb"))
-            packages.remove("org.apache.axis2.util");
-        else if (bundleName.startsWith("axis2-codegen")) {
-            packages.remove("org.apache.axis2.wsdl");
-            packages.remove("org.apache.axis2.wsdl.util");
-        }
-        else if (bundleName.startsWith("bsf-all"))
-            packages.remove("org.mozilla.javascript");
-        
-        return packages;
-    }
-    
-    private String packagesToString(HashSet<String> packages, String version) {
-        
-        StringBuilder pkgBuf = new StringBuilder();
-        for (String pkg : packages) {
-            if (pkgBuf.length() >0) pkgBuf.append(',');
-            pkgBuf.append(pkg);
-            if (version != null) {
-                pkgBuf.append(";version=\"");
-                pkgBuf.append(version);
-                pkgBuf.append('\"');
-            }
-        }
-        return pkgBuf.toString();
-    }
-    
-    private String getJarVersion(String bundleName) {
-        Pattern pattern = Pattern.compile("-([0-9.]+)");
-        Matcher matcher = pattern.matcher(bundleName);
-        String version = "1.0.0";
-        if (matcher.find()) {
-            version = matcher.group();
-            if (version.endsWith("."))
-                version = version.substring(1, version.length()-1);
-            else
-                version = version.substring(1);
-        }
-        return version;
-    }
-	
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-runtime/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-runtime/pom.xml
deleted file mode 100644
index d2dd94775b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-runtime/pom.xml
+++ /dev/null
@@ -1,177 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-runtime</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany Runtime Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA Runtime Bundle</Bundle-Description>
-                        <Bundle-Activator>org.apache.tuscany.sca.osgi.runtime.OSGiBundleActivator</Bundle-Activator>
-                        <DynamicImport-Package>org.apache.felix.main,org.eclipse.core.runtime.adaptor</DynamicImport-Package>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Dependency>tuscany*</Embed-Dependency>
-                        <_exportcontents>
-                            org.apache.tuscany.sca.*;version="2.0"
-                        </_exportcontents>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-spi/pom.xml b/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-spi/pom.xml
deleted file mode 100644
index 25c74bb163..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/osgi-tuscany/tuscany-spi/pom.xml
+++ /dev/null
@@ -1,120 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-tuscany-spi</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany SPI Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.spi</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA SPI Bundle</Bundle-Description>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Dependency>tuscany*</Embed-Dependency>
-                        <_exportcontents>
-                            org.apache.tuscany.sca.*;version="2.0"
-                        </_exportcontents>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/pom.xml b/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/pom.xml
deleted file mode 100644
index 6f45a90c38..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/pom.xml
+++ /dev/null
@@ -1,75 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security-jsr250</artifactId>
-    <name>Apache Tuscany SCA Policy Framework Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 3569410e7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ /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.    
- */
-package helloworld;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RunAs;
-import javax.annotation.security.RolesAllowed;
-
-/**
- * This class implements the HelloWorld service.
- */
-@RunAs("Administrator")
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-    @DenyAll()
-    public String getGreetingsDenyAll(String name) {
-        return "Hello " + name;
-    }
-
-    @PermitAll
-    public String getGreetingsPermitAll(String name) {
-        return "Hello " + name;
-    }
-
-    @RolesAllowed("Administrator")
-    public String getGreetingsRolesAllowed(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 3e752144a0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-    
-    public String getGreetingsRolesAllowed(String name);
-    
-    public String getGreetingsPermitAll(String name);
-    
-    public String getGreetingsDenyAll(String name);
-    
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/resources/definitions.xml b/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/resources/definitions.xml
deleted file mode 100644
index 64b8a95d18..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,29 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://itest/policy" >
-
-    <policySet name="allowed_users" appliesTo="sca:implementation.java">
-    	<permitAll/>
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/resources/helloworld.composite
deleted file mode 100644
index 456ca450f1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="http://itest/policy"
-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy"
-           name="Helloworld">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" policySets="ip:allowed_users"/>
-        <service name="HelloWorldService">
-        	<interface.java interface="helloworld.HelloWorldService"/>
-        </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
deleted file mode 100644
index da5f6409ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ /dev/null
@@ -1,54 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PolicySecurityJSR250TestCase {
-    private static SCADomain domain;
-    private static HelloWorldService service;
-
-    @Test
-    public void testPolicies() {
-        //TODO
-        String greetings = service.getGreetings("Luciano");
-        System.out.println(">>>" + greetings);
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("helloworld.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        service = domain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security/pom.xml b/tags/java/sca/1.3-RC1a/itest/policy-security/pom.xml
deleted file mode 100644
index ca47164695..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security/pom.xml
+++ /dev/null
@@ -1,68 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security</artifactId>
-    <name>Apache Tuscany SCA Policy Framework Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/resources/definitions.xml b/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/resources/definitions.xml
deleted file mode 100644
index c8118a0caf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://itest/policy" >
-
-    <policySet name="allowed_users" appliesTo="sca:implementation.java">
-    	<permitAll/>
-    </policySet>
-    
-    <policySet name="runAsAdmin" appliesTo="sca:implementation.java">
-    	<runAs role="Administrator"/>
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/resources/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/resources/helloworld.composite
deleted file mode 100644
index 9e0f289f87..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security/src/main/resources/helloworld.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://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="http://itest/policy"
-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy"
-           name="Helloworld">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" policySets="ip:allowed_users"/>
-        
-        <service name="HelloWorldService">
-        	<interface.java interface="helloworld.HelloWorldService"/>
-        </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/tags/java/sca/1.3-RC1a/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
deleted file mode 100644
index 9dad17741e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ /dev/null
@@ -1,54 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PolicyIdentityTestCase {
-    private static SCADomain domain;
-    private static HelloWorldService service;
-
-    @Test
-    public void testPolicies() {
-        //TODO
-        String greetings = service.getGreetings("Luciano");
-        System.out.println(">>>" + greetings);
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("helloworld.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        service = domain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/pom.xml b/tags/java/sca/1.3-RC1a/itest/policy/pom.xml
deleted file mode 100644
index d24b025479..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/pom.xml
+++ /dev/null
@@ -1,68 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy</artifactId>
-    <name>Apache Tuscany SCA Policy Framework Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/AddService.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/AddService.java
deleted file mode 100644
index 3e56bf3fad..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The Add service interface
- */
-@Remotable
-@Service
-//@Requires(PolicyQNames.TEST_INTENT_FIVE)
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ /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.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9abc488523..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,69 +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 calculator;
-
-import javax.security.auth.login.Configuration;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-        try {
-            Configuration secConf = Configuration.getConfiguration();
-        } catch ( java.lang.SecurityException e ) {
-            if ( e.getMessage().equals("Unable to locate a login configuration") ) {
-                System.setProperty("java.security.auth.login.config", "target/classes/CalculatorJass.config");
-            } else {
-                throw e;
-            }
-        }
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +
-                "policy for subtract and divide operations...");
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-        
-        calculatorService = 
-            scaDomain.getService(CalculatorService.class, "AnotherCalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +
-                "for all operations in the implementation...");
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index a1880698ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorService.java
+++ /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.    
- */
-package calculator;
-
-/**
- * The Calculator service interface.
- */
-
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 28ce0ec78a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/CalculatorServiceImpl.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 calculator;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Requires;
-
-
-/**
- * An implementation of the Calculator service.
- */
-@Requires(PolicyQNames.TEST_INTENT_ONE)
-public class CalculatorServiceImpl implements CalculatorService, PolicyQNames {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    //@Requires({TEST_INTENT_TWO, TEST_INTENT_THREE})
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    @Requires(TEST_INTENT_TWO)
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    @Requires(PolicyQNames.QUALIFIED_TEST_INTENT_ONE)
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    //@Requires(QUALIFIED_TEST_INTENT_FOUR)
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/DivideService.java
deleted file mode 100644
index f72b05cece..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,33 +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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The divide service interface
- */
-@Remotable
-@Service
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ /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.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/MultiplyService.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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ /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.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/PolicyQNames.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/PolicyQNames.java
deleted file mode 100644
index 3e1bc45842..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ /dev/null
@@ -1,43 +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 calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface PolicyQNames {
-    public static final String QUALIFIER = ".";
-    
-    public static final String POLICY_ITEST_PREFIX="{http://itest/policy}";
-    public static final String TEST_INTENT_ONE = POLICY_ITEST_PREFIX + "TestIntent_1";
-    public static final String TEST_INTENT_TWO = POLICY_ITEST_PREFIX + "TestIntent_2";
-    public static final String TEST_INTENT_THREE = POLICY_ITEST_PREFIX + "TestIntent_3";
-    public static final String TEST_INTENT_FOUR = POLICY_ITEST_PREFIX + "TestIntent_4";
-    public static final String TEST_INTENT_FIVE = POLICY_ITEST_PREFIX + "TestIntent_5";
-    
-    public static final String QUALIFIER_ONE = "Qualifier_1";
-    
-    public static final String QUALIFIED_TEST_INTENT_FOUR = 
-        TEST_INTENT_FOUR + QUALIFIER + QUALIFIER_ONE;
-    
-    public static final String QUALIFIED_TEST_INTENT_ONE = 
-        TEST_INTENT_ONE + QUALIFIER + QUALIFIER_ONE;
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/SubtractService.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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ /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.    
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
deleted file mode 100644
index 4b04a4d0b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ /dev/null
@@ -1,84 +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 calculator.policy;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.junit.Assert;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestImplPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... arg0) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( Object contextObj : context) {
-            if ( contextObj instanceof Operation ) {
-                Operation op = (Operation)contextObj;
-                //System.out.println(" *TestImplPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-                if ( op.getName().equals("add") ) {
-                    boolean match = applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation") ||
-                        applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_2_implementation") ||
-                        applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_Qualified_implementation") ||
-                        applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_3_implementation") ;
-                    Assert.assertTrue(match); 
-                } else if ( op.getName().equals("subtract") ) {
-                    boolean match = applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_Qualified_implementation") ||
-                    applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation");
-                    Assert.assertTrue(match); 
-                } else if ( op.getName().equals("divide")) {
-                    Assert.assertEquals(applicablePolicySet.getName().getLocalPart(), 
-                                        "TestPolicySet_1_implementation");
-                } else if ( op.getName().equals("multiply") ) {
-                    boolean match = applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_5_implementation") ||
-                    applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation");
-                    Assert.assertTrue(match);
-                }    
-                else {
-                    Assert.fail();
-                }
-                //System.out.println(" *TestImplPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-            } else if ( contextObj instanceof Message ) {
-                Message msg = (Message)contextObj;
-                System.out.println(" *TestImplPolicyHandler* " + msg.getOperation().getName() + " ** " + applicablePolicySet);
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet arg0) {
-        this.applicablePolicySet = arg0;
-    }
-
-    public void setUp(Object... arg0) {
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
deleted file mode 100644
index 3dcadd724e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ /dev/null
@@ -1,61 +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 calculator.policy;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestRefPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... arg0) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( Object contextObj : context) {
-            if ( contextObj instanceof Operation ) {
-                Operation op = (Operation)contextObj;
-                System.out.println(" *TestReflPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-            } else if ( contextObj instanceof Message ) {
-                Message msg = (Message)contextObj;
-                System.out.println(" *TestRefPolicyHandler* " + msg.getOperation().getName() + " ** " + applicablePolicySet);
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet arg0) {
-        this.applicablePolicySet = arg0;
-    }
-
-    public void setUp(Object... arg0) {
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
deleted file mode 100644
index 3d314a9d14..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ /dev/null
@@ -1,61 +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 calculator.policy;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestSvcPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... arg0) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( Object contextObj : context) {
-            if ( contextObj instanceof Operation ) {
-                Operation op = (Operation)contextObj;
-                System.out.println(" *TestSvcPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-            } else if ( contextObj instanceof Message ) {
-                Message msg = (Message)contextObj;
-                System.out.println(" *TestSvcPolicyHandler* " + msg.getOperation().getName() + " ** " + applicablePolicySet);
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet arg0) {
-        this.applicablePolicySet = arg0;
-    }
-
-    public void setUp(Object... arg0) {
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/Calculator.composite
deleted file mode 100644
index aed7684099..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,66 +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://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://itest/policy" xmlns:sample="http://itest/policy" name="Calculator"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:ip="http://itest/policy">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl"></implementation.java>
-        <!-- reference name="addService" target="AddServiceComponent" /-->
-        <reference name="addService">
-            <interface.java interface="calculator.AddService" />
-            <binding.ws uri="http://localhost:8085/AddServiceComponentWS" />
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl" requires="ip:TestIntent_3" />
-        <service name="AddService">
-            <interface.java interface="calculator.AddService" />
-            <binding.ws uri="http://localhost:8085/AddServiceComponentWS" />
-            <binding.sca/>
-        </service>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-    <component name="AnotherCalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index d9f144b3ff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

-# handler classname;qname=<policy intent addressed>;model=<policy model class>

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestRefPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:reference

-calculator.policy.TestSvcPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:service

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_1.Qualifier_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestRefPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:reference

-calculator.policy.TestSvcPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:service

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_3,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_5,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/definitions.xml b/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/definitions.xml
deleted file mode 100644
index 54aa8ec480..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,147 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://itest/policy"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:calc="http://calculator"
-    xmlns:ip="http://itest/policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_2" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Two</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_3" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Three</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_4" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Four</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_5" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Five</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_1.Qualifier_1" />
-
-
-
-    <!-- PolicySets -->
-    <sca:policySet name="TestPolicySet_1_implementation" provides="ip:TestIntent_1"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="ip:TestIntent_1" default="Qualifier_1">
-            <qualifier name="Qualifier_1">
-                <wsp:Policy />
-            </qualifier>
-        </intentMap>
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_1_Qualified_implementation" provides="ip:TestIntent_1.Qualifier_1"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_1_reference" provides="ip:TestIntent_1" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_1_service" provides="ip:TestIntent_1" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-
-    <sca:policySet name="TestPolicySet_2_implementation" provides="ip:TestIntent_2"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_2_reference" provides="ip:TestIntent_2" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_2_service" provides="ip:TestIntent_2" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-
-    <sca:policySet name="TestPolicySet_3_implementation" provides="ip:TestIntent_3"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-    
-    <sca:policySet name="TestPolicySet_3_reference" provides="ip:TestIntent_3" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_3_service" provides="ip:TestIntent_3" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_implementation" provides="ip:TestIntent_4"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_service" provides="ip:TestIntent_4" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_reference" provides="ip:TestIntent_4" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_5_implementation" provides="" appliesTo="sca:implementation.java"
-        tuscany:alwaysAppliesTo="sca:component[@name='MultiplyServiceComponent']"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_5_service" provides="ip:TestIntent_5" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_5_reference" provides="ip:TestIntent_5" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_qualified_1_implementation" provides="ip:TestIntent_4"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="ip:TestIntent_4" default="Qualifier_1">
-            <qualifier name="Qualifier_1">
-                <wsp:Policy />
-            </qualifier>
-        </intentMap>
-    </sca:policySet>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/tags/java/sca/1.3-RC1a/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
deleted file mode 100644
index 885e8314ef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ /dev/null
@@ -1,55 +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.itest;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.CalculatorService;
-
-public class PoliciedCalculatorTestCase {
-    private static SCADomain domain;
-    private static CalculatorService calculatorService;
-
-    @Test
-    public void testPolicies() {
-        calculatorService.add(10, 10);
-        calculatorService.multiply(10, 10);
-        calculatorService.divide(10, 10);
-        calculatorService.subtract(10, 10);
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("Calculator.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        calculatorService = domain.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/pom.xml b/tags/java/sca/1.3-RC1a/itest/pom.xml
deleted file mode 100644
index c4c56247f4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/pom.xml
+++ /dev/null
@@ -1,702 +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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-itest</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Integration Tests</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/wasAdmin.py</was.python.script>
-    </properties>
-
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>bpel</module>
-                <module>callablereferences</module>
-                <module>callablereferences-ws</module>
-                <module>callback-api</module>
-                <module>callback-basic</module>
-                <module>callback-complex-type</module>
-                <module>callback-id</module>
-                <module>callback-multiple-wires</module>
-                <module>callback-separatethread</module>
-                <module>callback-set-callback</module>
-                <module>callback-set-conversation</module>
-                <module>component-type</module>
-                <module>contribution</module>
-                <module>contribution-multiple</module>
-                <module>contribution-import-export</module>
-                <module>contribution-classloader</module>
-                <module>conversations</module>
-                <module>conversations-ws</module>
-                <module>databindings</module>
-                <module>exceptions</module>
-                <module>exceptions-cross-binding</module>
-                <module>exceptions-cross-binding-ws</module>
-                <module>exceptions-simple-ws</module>
-                <module>extended-api</module>
-                <module>interfaces</module>
-                <module>jms</module>
-                <module>large-sdo-ws</module>
-                <module>late-reference-resolution</module>
-                <module>oneway</module>
-                <module>operation-overloading</module>
-                <module>osgi-implementation</module>
-                <module>osgi-contribution</module>
-                <module>policy</module>
-                <module>policy-security</module>
-                <module>policy-security-jsr250</module>
-                <module>properties</module>
-                <module>recursive</module>
-                <module>recursive-multi-level</module>
-                <module>recursive-ws</module>
-                <module>references</module>
-                <module>serialization</module>
-                <module>services</module>
-                <module>spring</module>
-                <module>scopes</module>
-                <module>transaction</module>
-                <module>validation</module>
-                <module>wires</module>
-                <module>wsdl</module>
-                <module>wsdlless</module>
-                <module>wsdl2java</module>
-                <module>wsdl-multiple</module>
-                <module>ws-void-args-return</module>
-           </modules>
-        </profile>
-        
-        <!-- 
-        This profile handles generation of jar/war artifacts to be used in executing tests in a web-container
-        -->
-        <profile>
-            <id>webapp</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>src</exists>
-                </file>
-                -->
-            </activation>
-            
-            <dependencies>
-                <dependency>
-	    	    <groupId>org.apache.tuscany.sca</groupId>
-	    	    <artifactId>tuscany-host-webapp</artifactId>
-	    	    <version>1.3</version>
-                    <scope>runtime</scope>
-	    	</dependency>
-                <dependency>
-	    	    <groupId>org.apache.tuscany.sca</groupId>
-	    	    <artifactId>tuscany-host-webapp-junit</artifactId>
-	    	    <version>1.3</version>
-                    <scope>runtime</scope>
-	    	</dependency>
-                <dependency>
-	    	    <groupId>javax.servlet</groupId>
-	    	    <artifactId>servlet-api</artifactId>
-	    	    <version>2.3</version>
-                    <scope>provided</scope>
-	    	</dependency>
-	    </dependencies>    
-
-            <modules>
-                <module>callback-api</module>
-                <module>callback-basic</module>
-                <!--
-                <module>callback-complex-type</module>
-                -->
-                <module>callback-id</module>
-                <module>callback-multiple-wires</module>
-                <module>callback-set-callback</module>
-                <module>callback-set-conversation</module>
-                <!--
-                <module>contribution</module>
-                <module>contribution-multiple</module>
-                <module>contribution-import-export</module>
-                <module>contribution-classloader</module>
-                -->
-                <module>conversations</module>
-                <module>exceptions</module>
-                <module>exceptions-cross-binding</module>
-                <module>extended-api</module>
-                <module>oneway</module>
-                <module>operation-overloading</module>
-                <!--
-                <module>properties</module>
-                <module>recursive</module>
-                -->
-                <module>references</module>
-                <module>services</module>
-                <module>component-type</module>
-                <module>interfaces</module>
-                <module>wires</module>
-                <module>scopes</module>
-                <module>large-sdo-ws</module>
-            </modules>
-
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <!-- Skip local junit test cases -->
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.3.1</version>
-                            <configuration>
-                                <skip>true</skip>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-
-                <plugins>
-
-                    <!-- Create jar containing the jUnit tests -->
-                    <!--
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <version>2.2</version>
-                        <executions>
-                            <execution>
-                                <configuration>
-                                    <finalName>junit</finalName>
-                                </configuration>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    -->
-
-                    <!-- Generate web-xml -->
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Create war and include jUnit test classes -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <version>2.0.2</version>
-                        <configuration>
-                            <primaryArtifact>false</primaryArtifact>
-                            <!-- Exclude a few jars to avoid conflicts -->
-                            <warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
-                            <webResources>
-                                <!-- Add the tests jar into the WAR -->
-                                <!--
-                                <resource>
-                                    <directory>${project.build.directory}</directory>
-                                    <includes>
-                                        <include>*-tests.jar</include>
-                                    </includes>
-                                    <targetPath>WEB-INF/lib</targetPath>
-                                </resource>
-                                -->
-
-                                <resource>
-                                    <directory>${project.build.directory}/test-classes</directory>
-                                    <targetPath>WEB-INF/classes</targetPath>
-                                </resource>
-
-                                <resource>
-                                    <directory>${project.build.directory}/classes/META-INF</directory>
-                                    <includes>
-                                        <include>sca-contribution*.xml</include>
-                                    </includes>
-                                    <targetPath>META-INF</targetPath>
-                                </resource>
-
-                                <!-- Add the junit -->
-                                <resource>
-                                    <directory>${settings.localRepository}/junit/junit/4.2</directory>
-                                    <includes>
-                                        <include>junit-4.2.jar</include>
-                                    </includes>
-                                    <targetPath>WEB-INF/lib</targetPath>
-                                </resource>
-
-                            </webResources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>war</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>tomcat</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>src</exists>
-                </file>
-                -->
-            </activation>
-           <properties>
-               <http.port>8085</http.port>
-               <http.base>http://127.0.0.1:${http.port}</http.base>
-               <tomcat.home>${env.CATALINA_HOME}</tomcat.home>
-           </properties>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>web-junit-test</id>
-                                <configuration>
-                                    <url>${http.base}/${project.build.finalName}/junit?op=runAll</url>
-                                </configuration>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <container>
-                                <containerId>tomcat5x</containerId>
-                                <type>installed</type>
-                                <home>${tomcat.home}</home>
-                                <systemProperties>
-                                    <org.apache.commons.logging.Log>
-                                        org.apache.commons.logging.impl.SimpleLog
-                                    </org.apache.commons.logging.Log>
-                                </systemProperties>
-                            </container>
-                            <wait>false</wait>
-                            <configuration>
-                                <properties>
-                                    <cargo.servlet.port>${http.port}</cargo.servlet.port>
-                                </properties>
-                                <deployables>
-                                    <deployable>
-                                        <location>${project.build.directory}/${project.build.finalName}.war</location>
-                                        <pingURL>${http.base}/${project.build.finalName}/junit?op=list</pingURL>
-                                        <type>war</type>
-                                    </deployable>
-                                </deployables>
-                                <home>${project.build.directory}/cargo-tomcat</home>
-                            </configuration>
-                        </configuration>
-
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-
-        <profile>
-            <id>jetty</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>src</exists>
-                </file>
-                -->
-            </activation>
-           <properties>
-               <http.port>8085</http.port>
-               <http.base>http://127.0.0.1:${http.port}</http.base>
-               <jetty.home>${env.JETTY_HOME}</jetty.home>
-           </properties>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>web-junit-test</id>
-                                <configuration>
-                                    <url>${http.base}/${project.build.finalName}/junit?op=runAll</url>
-                                </configuration>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <container>
-                                <containerId>jetty6x</containerId>
-                                <type>embedded</type>
-                                <home>${jetty.home}</home>
-                                <systemProperties>
-                                    <org.apache.commons.logging.Log>
-                                        org.apache.commons.logging.impl.SimpleLog
-                                    </org.apache.commons.logging.Log>
-                                </systemProperties>
-                            </container>
-                            <wait>false</wait>
-                            <configuration>
-                                <properties>
-                                    <cargo.servlet.port>${http.port}</cargo.servlet.port>
-                                </properties>
-                                <deployables>
-                                    <deployable>
-                                        <location>${project.build.directory}/${project.build.finalName}.war</location>
-                                        <pingURL>${http.base}/${project.build.finalName}/junit?op=list</pingURL>
-                                        <type>war</type>
-                                    </deployable>
-                                </deployables>
-                                <home>${project.build.directory}/cargo-jetty</home>
-                            </configuration>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>geronimo</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>${geronimo.home}</exists>
-                </file>
-                -->
-            </activation>
-            <properties>
-                <http.port>8080</http.port>
-                <http.base>http://127.0.0.1:${http.port}</http.base>
-                <geronimo.home>${env.GERONIMO_HOME}</geronimo.home>
-            </properties>
-
-            <build>
-                <plugins>
-                    <!-- Generate web-xml and geronimo deployment descriptor -->
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <configuration>
-                                    <geronimo>true</geronimo>
-                                </configuration>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>web-junit-test</id>
-                                <configuration>
-                                    <url>${http.base}/${project.build.finalName}/junit?op=runAll</url>
-                                </configuration>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                        <version>2.1.1</version>
-                        <configuration>
-                            <geronimoHome>${geronimo.home}</geronimoHome>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                                <configuration>
-                                    <background>true</background>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>deploy-war</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>deploy</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleArchive>${project.build.directory}/${project.build.finalName}.war</moduleArchive>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>undeploy-war</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>undeploy</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                                <configuration>
-                                    <username>system</username>
-                                    <password>manager</password>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>websphere</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <http.port>8080</http.port>
-                <http.base>http://127.0.0.1:${http.port}</http.base>
-                <websphere.home>${env.WAS_HOME}</websphere.home>
-            </properties>
-
-            <build>
-                <plugins>
-                    <!-- Generate web-xml and geronimo deployment descriptor -->
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>web-junit-test</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <url>${http.base}/${project.build.finalName}/junit?op=runAll</url>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-		    <!--WAS ant integration -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
-                        <executions>
-                            <!-- start Websphere server -->
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="startServer"/>
-	                            </tasks>
-	                        </configuration>
-	                    </execution>
-                            <!-- Deploy war application -->
-                            <execution>
-                                <id>deploy-war</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="installApplication">
-                                            <property name="was.python.script" value="${was.python.script}"/>
-                                            <property name="application.war" value="${project.build.directory}/${project.build.finalName}.war"/>
-                                            <property name="application.name" value="${project.build.finalName}.war"/>
-                                            <property name="application.contextRoot" value="${project.build.finalName}"/>
-                                            <property name="application.server" value="server1"/>
-                                        </ant>
-	                            </tasks>
-	                        </configuration>
-                            </execution>
-                            <!-- unDeploy war application -->
-                            <execution>
-                                <id>undeploy-war</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="uninstallApplication">
-                                            <property name="was.python.script" value="${was.python.script}"/>
-                                            <property name="application.name" value="${project.build.finalName}.war"/>
-                                        </ant>
-	                            </tasks>
-	                        </configuration>
-                            </execution>
-                            <!-- Stop Websphere server -->
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="stopServer"/>
-	                            </tasks>
-	                        </configuration>
-                            </execution>
-
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-
-    </profiles>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/pom.xml b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/pom.xml
deleted file mode 100644
index a6afef6d9c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-promotion-interface-missmatch</artifactId>
-    <name>Apache Tuscany Test for Missmatched Interfaces During Promotion</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
deleted file mode 100644
index 764f31b7cd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
+++ /dev/null
@@ -1,43 +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 com.example;
-
-public class BusinessException extends Exception {
-
-    private String clientName;
-
-    public BusinessException(String message) {
-        super(message);
-    }
-
-    public BusinessException(String message, String clientName) {
-        super(message);
-        this.clientName = clientName;
-    }
-
-    public String getClientName() {
-        return clientName;
-    }
-
-    public void setClientName(String clientName) {
-        this.clientName = clientName;
-    }
-
-}
-
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index 0c72b52ed9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
+++ /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.    
- */
-package com.example;
-
-public interface ExampleClient {
-    void runTest();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index d6545b5a23..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
+++ /dev/null
@@ -1,44 +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 com.example;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ExampleClient.class)
-@Scope("COMPOSITE")
-public class ExampleClientImpl implements ExampleClient {
-
-    private ExampleService myService;
-
-    @Reference
-    public void setMyService(ExampleService myService) {
-        this.myService = myService;
-    }
-
-    public void runTest() {
-        try {
-            Object result = myService.hello("John");
-            System.out.println("myService returned " + result.getClass().getName());
-        } catch (BusinessException e) {
-            System.out.println("caught exception from hello(): " + e.getMessage() + " for " + e.getClientName());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 30ea559694..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.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 com.example;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExampleService {
-
-	String hello(String name) throws BusinessException;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index b3b6f033e5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
+++ /dev/null
@@ -1,26 +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 com.example;
-
-public class ExampleServiceImpl implements ExampleService {
-    public String hello(String name) throws BusinessException {
-        throw new BusinessException("bad news", name);
-        // return "Hello, " + name;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/example.composite b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/example.composite
deleted file mode 100644
index cddf951d65..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/example.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="/model/common/"
-           xmlns:hw="/model/common/"
-           name="example">
-
-    <component name="ExampleClientComponent">
-        <implementation.java class="com.example.ExampleClientImpl" />
-        <reference name="myService" />
-    </component>
-    
-    <reference name="myService"
-         promote="ExampleClientComponent/myService">
-        <!--
-         The following interface definition violates the SCA specification because it
-         uses has a different namespace ("/model/common/") than the namespace of the
-         implicit interface.java on the promoted coponent service ("http://example.com").
-         The runtime should report an error for this mismatch.
-        -->
-        <interface.wsdl interface="/model/common/#wsdl.interface(ExampleServicePortType)" />
-        <binding.ws uri="http://localhost:8085/axis2/services/ExampleService" />
-    </reference>
-
-    <component name="ExampleComponent">
-        <implementation.java class="com.example.ExampleServiceImpl"/>
-        <service name="ExampleService">
-            <interface.wsdl interface="/model/common/#wsdl.interface(ExampleServicePortType)" />
-            <binding.ws wsdlElement="/model/common/#wsdl.binding(ExampleServiceSOAP11Binding)"
-			            uri="http://localhost:8085/axis2/services/ExampleService" />
-        </service>  
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
deleted file mode 100644
index a8ccde2e11..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
+++ /dev/null
@@ -1,133 +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.    
--->
-<!--definitions
-     name="EmpFlexFieldService"
-     targetNamespace="/model/common/"
-     xmlns="http://schemas.xmlsoap.org/wsdl/"
-     xmlns:tns="/model/common/"
-     xmlns:errors="http://xmlns.oracle.com/adf/svc/errors/"
-     xmlns:types="/model/common/types/"
-     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-				  xmlns:ns0="http://example.com"
-				  xmlns:ns2="/model/common/types/"
-				  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-				  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-				  xmlns:ns1="http://example.com/xsd"
-				  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-				  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-				  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-				  targetNamespace="/model/common/"
-				  xmlns:tns="/model/common/">
-    <wsdl:types>
-        <xs:schema>
-            <import namespace="/model/common/types/" schemaLocation="ExampleServiceTypes.xsd"/>
-        </xs:schema>
-        <xs:schema xmlns:ns="http://example.com" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com">
-            <xs:element name="BusinessException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="BusinessException" nillable="true" type="ns1:BusinessException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-        <xs:schema xmlns:ax21="http://example.com/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com/xsd">
-            <xs:complexType name="BusinessException">
-                <xs:complexContent>
-                    <xs:extension base="tns:Exception">
-                        <xs:sequence/>
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="helloRequest">
-        <wsdl:part name="parameters" element="ns2:hello"/>
-    </wsdl:message>
-    <wsdl:message name="helloResponse">
-        <wsdl:part name="parameters" element="ns2:helloResponse"/>
-    </wsdl:message>
-    <wsdl:message name="BusinessException">
-        <wsdl:part name="parameters" element="ns0:BusinessException"/>
-    </wsdl:message>
-    <wsdl:portType name="ExampleServicePortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:helloRequest" wsaw:Action="urn:hello"/>
-            <wsdl:output message="tns:helloResponse" wsaw:Action="urn:helloResponse"/>
-            <wsdl:fault message="tns:BusinessException" name="BusinessException" wsaw:Action="urn:helloBusinessException"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="ExampleServiceSOAP11Binding" type="tns:ExampleServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="hello">
-            <soap:operation soapAction="urn:hello" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="BusinessException">
-                <soap:fault use="literal" name="BusinessException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="ExampleServiceSOAP12Binding" type="tns:ExampleServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="hello">
-            <soap12:operation soapAction="urn:hello" style="document"/>
-            <wsdl:input>
-                <soap12:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="BusinessException">
-                <soap12:fault use="literal" name="BusinessException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="ExampleServiceHttpBinding" type="tns:ExampleServicePortType">
-        <http:binding verb="POST"/>
-        <wsdl:operation name="hello">
-            <http:operation location="ExampleService/hello"/>
-            <wsdl:input>
-                <mime:content type="text/xml" part="hello"/>
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="hello"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="ExampleService">
-        <wsdl:port name="ExampleServiceSOAP11port_http" binding="tns:ExampleServiceSOAP11Binding">
-            <soap:address location="http://localhost:8085/axis2/services/ExampleService"/>
-        </wsdl:port>
-        <wsdl:port name="ExampleServiceSOAP12port_http" binding="tns:ExampleServiceSOAP12Binding">
-            <soap12:address location="http://localhost:8085/axis2/services/ExampleService"/>
-        </wsdl:port>
-        <wsdl:port name="ExampleServiceHttpport" binding="tns:ExampleServiceHttpBinding">
-            <http:address location="http://localhost:8085/axis2/services/ExampleService"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
deleted file mode 100644
index 2caec0f20d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
+++ /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.    
--->
-
-        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-		           xmlns:ns="/model/common/"
-				   attributeFormDefault="qualified"
-				   elementFormDefault="qualified"
-                   xmlns:tns="/model/common/types/"
-				   targetNamespace="/model/common/types/">
-            <xs:complexType name="Exception">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType"/>
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="hello">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="helloResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
diff --git a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 740af4f43d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
+++ /dev/null
@@ -1,44 +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 com.example;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExampleTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private ExampleClient client;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("example.composite");
-        client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        client.runTest();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/pom.xml b/tags/java/sca/1.3-RC1a/itest/properties/pom.xml
deleted file mode 100644
index e1a8dfb903..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/pom.xml
+++ /dev/null
@@ -1,91 +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-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-properties</artifactId>

-    <name>Apache Tuscany SCA Properties Integration Tests</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.3</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>1.3</version>

-            <scope>compile</scope>

-        </dependency>

-    </dependencies>

-    <build>

-        <plugins>

-		    <plugin>

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

-                <artifactId>tuscany-sdo-plugin</artifactId>

-                <version>1.1-incubating</version>

-                <executions>

-                    <execution>

-                        <id>generate-customer-sdo</id>

-                        <phase>generate-sources</phase>

-                        <configuration>

-                            <schemaFile>${basedir}/src/main/resources/customer.xsd</schemaFile>

-                            <javaPackage>com.example.customer.sdo</javaPackage>

-                            <noNotification>true</noNotification>

-                            <noContainer>true</noContainer>

-                            <noUnsettable>true</noUnsettable>

-                        </configuration>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-		</plugins>

-    </build>

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
deleted file mode 100644
index b0fd64c9da..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ /dev/null
@@ -1,34 +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 mysca.test.myservice.impl;
-
-public interface MyService {
-    /**
-     * This is a method to get the location property value from the sca runtime environment. It is implemented in the
-     * class MyServiceImpl
-     */
-    String getLocation();
-
-    /**
-     * This is a method to get the year property value from the sca runtime environment. It is implemented in the class
-     * MyServiceImpl
-     */
-    String getYear();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
deleted file mode 100644
index 51d064ba81..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ /dev/null
@@ -1,88 +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 mysca.test.myservice.impl;
-
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface MyService and gives implementation for all methods which are declared in that
- * interface. scope is specified as Composite using
- * 
- * @scope annotation.
- */
-
-@Service(MyService.class)
-public class MyServiceImpl implements MyService {
-
-    @Property(name = "location")
-    protected String location = "RTP";
-
-    @Property(name = "year")
-    protected String year = "2006";
-
-    @ComponentName
-    protected String componentName;
-
-    private Logger logger;
-
-    /**
-     * @ to print the message in the log
-     */
-    public MyServiceImpl() {
-        logger = Logger.getAnonymousLogger();
-        logger.info("creating service instance...");
-    }
-
-    /**
-     * @Init annotation to Start the service. Which is executed all the time
-     */
-    @Init
-    public void start() {
-        logger.info("Start service..");
-    }
-
-    /**
-     * @Destroy annotation to stop the service. Which is executed in the end
-     */
-    @Destroy
-    public void stop() {
-        logger.info("Stop service..");
-
-    }
-
-    public String getComponentName() {
-        return componentName;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public String getYear() {
-        return year;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
deleted file mode 100644
index 38c26e70d6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ /dev/null
@@ -1,46 +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 mysca.test.myservice.impl;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface MyService and gives implementation for all methods which are declared in that
- * interface. scope is specified as Composite using
- * 
- * @scope annotation.
- */
-
-@Service(MyService.class)
-public class MyTotalServiceImpl implements MyService {
-
-    // default required==true so it is 1:1
-    @Reference
-    public MyService myService;
-
-    public String getLocation() {
-        return myService.getLocation();
-    }
-
-    public String getYear() {
-        return myService.getYear();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
deleted file mode 100644
index 68ce5a3cb6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ /dev/null
@@ -1,50 +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.itest;
-
-/**
- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this
- * interface. Implementation for these methods is provided in ABCDComponentImpl Class
- */
-public interface ABCDComponent {
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getA();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getB();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getC();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getD();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
deleted file mode 100644
index 6b714c0d67..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ /dev/null
@@ -1,73 +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.itest;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This class Implements the interface ABCDComponent and gives implementation for all methods which are declared in that
- * interface. scope is specified as Composite using
- * 
- * @scope annotation.
- */
-@Scope("COMPOSITE")
-public class ABCDComponentImpl implements ABCDComponent {
-    private ABComponent abComponent;
-    private CDComponent cdComponent;
-
-    /**
-     * It is a method which injects the property value to the variable 'abComponent' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Reference
-    public void setAb(ABComponent component) {
-        this.abComponent = component;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'cdComponent' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Reference
-    public void setCd(CDComponent component) {
-        this.cdComponent = component;
-    }
-
-    public String getA() {
-        return this.abComponent.getA();
-    }
-
-    public String getB() {
-        return this.abComponent.getB();
-    }
-
-    public String getC() {
-        return this.cdComponent.getC();
-    }
-
-    public String getD() {
-        return this.cdComponent.getD();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
deleted file mode 100644
index 586d4864a9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ /dev/null
@@ -1,75 +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.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this
- * interface. Implementation for these methods is provided in ABComponentImpl Class
- */
-@Remotable
-public interface ABComponent {
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-
-    String getA();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-    String getB();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-    String getZ();
-
-    /**
-     * This is a method to get an integer property value from the SCA runtime environment. It is implemented in the
-     * class ABComponentImpl
-     */
-    int getIntValue();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-    String getF();
-
-    /**
-     * This is a method to get collection of property values from the SCA runtime environment. It is implemented in the
-     * class ABComponentImpl
-     */
-    Collection<String> getManyStringValues();
-
-    /**
-     * This is a method to get collection of property value from the SCA runtime environment. It is implemented in the
-     * class ABComponentImpl
-     */
-    Collection<Integer> getManyIntegers();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
deleted file mode 100644
index 5e3c985144..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.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.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * This class Implements the interface ABComponent and gives implementation for all methods which are declared in that
- * interface.
- */
-
-public class ABComponentImpl implements ABComponent {
-
-    private String aProperty;
-    private String bProperty;
-    private int intValue;
-    private Collection<String> manyStringValues;
-    private Collection<Integer> manyIntegerValues;
-    private String zProperty;
-    private String fProperty;
-
-    /**
-     * It is a method which injects the property value to the variable 'zProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property(name = "xpath")
-    public void setZProperty(final String value) {
-        this.zProperty = value;
-    }
-
-    /**
-     * It is a method which injects collection of property values to the variable 'manyStringValues' from the SCA
-     * runtime environment using Annotations.
-     */
-    @Property(name = "foobar")
-    public void setManyStringValues(final Collection<String> value) {
-        this.manyStringValues = value;
-    }
-
-    /**
-     * It is a method which injects collection of integer property values to the variable 'manyIntegerValues' from the
-     * SCA runtime environment using Annotations.
-     */
-    @Property(name = "fooInts")
-    public void setManyIntegers(final Collection<Integer> value) {
-        this.manyIntegerValues = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'aProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setA(final String A) {
-        this.aProperty = A;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'bProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setB(final String B) {
-        this.bProperty = B;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'fProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setF(final String F) {
-        this.fProperty = F;
-    }
-
-    /**
-     * It is a method which injects integer property value to the variable 'intValue' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setOne(final int value) {
-        this.intValue = value;
-    }
-
-    public String getA() {
-        return this.aProperty;
-    }
-
-    public String getB() {
-        return this.bProperty;
-    }
-
-    public int getIntValue() {
-        return this.intValue;
-    }
-
-    public String getZ() {
-        return this.zProperty;
-    }
-
-    public String getF() {
-        return this.fProperty;
-    }
-
-    public Collection<String> getManyStringValues() {
-        return manyStringValues;
-    }
-
-    public Collection<Integer> getManyIntegers() {
-        return manyIntegerValues;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
deleted file mode 100644
index 52f9871d1b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ /dev/null
@@ -1,71 +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.itest;
-
-import java.util.Collection;
-
-/**
- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this
- * interface. Implementation for these methods is provided in CDComponentImpl Class
- */
-public interface CDComponent {
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getC();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getC2();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getD();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getNoSource();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getFileProperty();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    Collection<String> getManyValuesFileProperty();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    int getOverrideValue();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
deleted file mode 100644
index 5b93bd8b8a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ /dev/null
@@ -1,143 +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.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * This class Implements the interface CDComponent and gives implementation for all methods which are declared in that
- * interface.
- */
-public class CDComponentImpl implements CDComponent {
-
-    private String cProperty;
-    private String dProperty;
-    private String nosource;
-    private String fileProperty;
-    private Collection<String> manyValuesFileProperty;
-    private int overrideNumber;
-    private String cProperty2;
-
-    /**
-     * It is a method which injects the property value to the variable 'cProperty2' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "nonFileProperty")
-    public void setC2(final String value) {
-        this.cProperty2 = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'overrideNumber' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "two")
-    public void setOverrideNumber(final int value) {
-        this.overrideNumber = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'fileProperty' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "fileProperty")
-    public void setFileProp(final String value) {
-        this.fileProperty = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'manyValuesFileProperty' from the SCA runtime
-     * environment using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "manyValuesFileProperty")
-    public void setFileManyValueProp(final Collection<String> values) {
-        this.manyValuesFileProperty = values;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'cProperty' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property
-    public void setC(final String C) {
-        this.cProperty = C;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'dProperty' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property
-    public void setD(final String D) {
-        this.dProperty = D;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'nosource' from the SCA runtime environment using
-     * 
-     * @Property Annotations.
-     */
-    @Property
-    public void setNosource(final String value) {
-        this.nosource = value;
-    }
-
-    public String getFileProperty() {
-        return this.fileProperty;
-    }
-
-    public String getC() {
-        return this.cProperty;
-    }
-
-    public String getC2() {
-        return this.cProperty2;
-    }
-
-    public String getD() {
-        return this.dProperty;
-    }
-
-    public String getNoSource() {
-        return this.nosource;
-    }
-
-    public int getOverrideValue() {
-        return this.overrideNumber;
-    }
-
-    public Collection<String> getManyValuesFileProperty() {
-        return this.manyValuesFileProperty;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
deleted file mode 100644
index c0c068d12e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ /dev/null
@@ -1,151 +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.itest;

-

-/**

- * This is a Java Bean which has setter and getter methods for for the variables used in the property tests.

- */

-public class ComplexPropertyBean {

-

-    /**

-     * Variable declarations

-     */

-    protected int integerNumber = 25;

-    protected float floatNumber = 50;

-    protected double doubleNumber = 75;

-    protected int[] intArray = null;

-    protected double[] doubleArray = null;

-    protected String[] stringArray = null;

-

-    ComplexPropertyBean numberSet;

-    protected ComplexPropertyBean[] numberSetArray = null;

-

-    public ComplexPropertyBean() {

-

-    }

-

-    public double getDoubleNumber() {

-        return doubleNumber;

-    }

-

-    /**

-     * It is a setter method to set a value for the variable doubleNumber

-     */

-    public void setDoubleNumber(double doubleNumber) {

-        this.doubleNumber = doubleNumber;

-    }

-

-    /**

-     * It is a getter method to get a value for the variable floatNumber

-     */

-    public float getFloatNumber() {

-        return floatNumber;

-    }

-

-    /**

-     * It is a setter method to set a value for the variable floatNumber

-     */

-    public void setFloatNumber(float floatNumber) {

-        this.floatNumber = floatNumber;

-    }

-

-    /**

-     * It is a getter method to get a value for the variable floatNumber

-     */

-    public int getIntegerNumber() {

-        return integerNumber;

-    }

-

-    /**

-     * It is a getter method to get a value for the variable integerNumber

-     */

-    public void setIntegerNumber(int integerNumber) {

-        this.integerNumber = integerNumber;

-    }

-

-    /**

-     * It is a getter method to set a value for the variable numberSet

-     */

-    public ComplexPropertyBean getNumberSet() {

-        return numberSet;

-    }

-

-    /**

-     * It is a setter method to set a value for the variable numberSet

-     */

-    public void setNumberSet(ComplexPropertyBean numberSet) {

-        this.numberSet = numberSet;

-    }

-

-    /**

-     * It is a method which implements toString() function

-     */

-    @Override

-    public String toString() {

-        return Double.toString(integerNumber) + " - "

-            + Double.toString(floatNumber)

-            + " - "

-            + Double.toString(doubleNumber)

-            + " \n"

-            + ((intArray == null) ? "" : intArray[0] + " - " + intArray[1] + " \n ")

-            + ((doubleArray == null) ? "" : doubleArray[0] + " - " + doubleArray[1] + " \n ")

-            + ((stringArray == null) ? "" : stringArray[0] + " - " + stringArray[1] + " \n ")

-            + ((numberSetArray == null) ? "" : numberSetArray[0] + " - " + numberSetArray[1] + " \n ")

-            + ((numberSet == null) ? "" : numberSet.toString());

-    }

-

-    /**

-     * It is a setter method to set values for the variable stringArray

-     */

-    public String[] getStringArray() {

-        return stringArray;

-    }

-

-    /**

-     * It is a setter method to set values for the variable stringArray

-     */

-    public void setStringArray(String[] stringArray) {

-        this.stringArray = stringArray;

-    }

-

-    public int[] getIntArray() {

-        return intArray;

-    }

-

-    public void setIntArray(int[] intArray) {

-        this.intArray = intArray;

-    }

-

-    public double[] getDoubleArray() {

-        return doubleArray;

-    }

-

-    public void setDoubleArray(double[] doubleArray) {

-        this.doubleArray = doubleArray;

-    }

-

-    public ComplexPropertyBean[] getNumberSetArray() {

-        return numberSetArray;

-    }

-

-    public void setNumberSetArray(ComplexPropertyBean[] numberSetArray) {

-        this.numberSetArray = numberSetArray;

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
deleted file mode 100644
index acd1f26670..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.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 org.apache.tuscany.sca.itest;
-
-/**
- * This is an Interface for the services
- */
-public interface OverrideService {
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
deleted file mode 100644
index 71dce41efc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.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 org.apache.tuscany.sca.itest;
-
-/**
- * An implementation for the interface OverrideService.
- */
-
-public class OverrideServiceImpl implements OverrideService {
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
deleted file mode 100644
index 17b4e582d6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ /dev/null
@@ -1,134 +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.itest;

-

-import java.util.Collection;

-

-import commonj.sdo.DataObject;

-

-import test.jaxb.props.ReturnCodeProperties;

-/**

- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this

- * interface. Implementation for these methods is provided in PropertyComponentImpl Class

- */

-public interface PropertyComponent {

-

-    /**

-     * This is a method to get a value for a property name 'location' from the SCA runtime environment. It is

-     * implemented in the class PropertyComponentImpl

-     */

-    public String getLocation();

-

-    /**

-     * This is a method to get a value for a property name 'year' from the SCA runtime environment. It is implemented in

-     * the class PropertyComponentImpl

-     */

-    public String getYear();

-

-    /**

-     * This method is used to test injecting a primitive String Array

-     * 

-     * @return The injected array

-     */

-    public String[] getDaysOfTheWeek();

-

-    /**

-     * This method is used to test injecting an Object Integer Array

-     * 

-     * @return The injected array

-     */

-    public Integer[] getIntegerNumbers();

-

-    /**

-     * This method is used to test injecting an int Array

-     * 

-     * @return The injected array

-     */

-    public int[] getIntNumbers();

-

-    /**

-     * This method is used to test injecting an Object Array

-     * 

-     * @return The injected array

-     */

-    public DataObject[] getSdoArrayProperty();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-

-    public ComplexPropertyBean getComplexPropertyOne();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ComplexPropertyBean getComplexPropertyTwo();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ComplexPropertyBean getComplexPropertyThree();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public Collection<ComplexPropertyBean> getComplexPropertyFour();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-

-    public ComplexPropertyBean getComplexPropertyFive();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public DataObject getSdoProperty();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public DataObject getCustomerSdo();

-    

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ReturnCodeProperties getComplexJAXBPropertyOne();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ReturnCodeProperties getComplexJAXBPropertyTwo();

-

-    /**

-     * @return

-     */

-    public String getLocationFromComponentContext();

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
deleted file mode 100644
index eb642b6637..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ /dev/null
@@ -1,188 +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.itest;

-

-import java.util.Collection;

-

-import org.osoa.sca.ComponentContext;

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

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

-

-import com.example.customer.sdo.impl.CustomerImpl;

-import commonj.sdo.DataObject;

-

-import test.jaxb.props.ReturnCodeProperties;

-

-/**

- * This class Implements the interface PropertyComponent and gives implementation for all methods which are declared in

- * that interface.

- */

-public class PropertyComponentImpl implements PropertyComponent {

-    @Context

-    protected ComponentContext context;

-    

-    @Property

-    protected CustomerImpl customerSdo;

-

-    @Property

-    protected DataObject sdoProperty;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyOne;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyTwo;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyThree;

-

-    @Property

-    protected Collection<ComplexPropertyBean> complexPropertyFour;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyFive;

-

-    @Property(name = "location")

-    protected String location;

-

-    @Property(name = "year")

-    protected String year;

-

-    @Property(name = "daysOfTheWeek")

-    protected String[] daysOfTheWeek;

-

-    @Property(name = "integerNumbers")

-    protected Integer[] integerNumbers;

-

-    @Property(name = "intNumbers")

-    protected int[] intNumbers;

-

-    @Property(name = "sdoArray")

-    protected DataObject[] sdoArray;

-

-    @Property

-    protected ReturnCodeProperties complexJAXBPropertyOne;

-

-    @Property

-    protected ReturnCodeProperties complexJAXBPropertyTwo;

-

-    public String getLocation() {

-        return location;

-    }

-

-    public String getYear() {

-        return year;

-    }

-

-    public ComplexPropertyBean getComplexPropertyOne() {

-        //System.out.println(complexPropertyOne);

-        return complexPropertyOne;

-    }

-

-    public ComplexPropertyBean getComplexPropertyTwo() {

-        //System.out.println(complexPropertyTwo);

-        return complexPropertyTwo;

-    }

-

-    public ComplexPropertyBean getComplexPropertyThree() {

-        //System.out.println(complexPropertyThree);

-        return complexPropertyThree;

-    }

-

-    public Collection<ComplexPropertyBean> getComplexPropertyFour() {

-        //System.out.println(complexPropertyThree);

-        return complexPropertyFour;

-    }

-

-    public ComplexPropertyBean getComplexPropertyFive() {

-        return complexPropertyFive;

-    }

-

-    public DataObject getSdoProperty() {

-        return sdoProperty;

-    }

-

-    /**

-     * It is a method which injects the property value to the variable 'sdoProperty' from the SCA runtime environment.

-     */

-    public void setSdoProperty(DataObject sdoProperty) {

-        System.out.println("Reached here da machi");

-        this.sdoProperty = sdoProperty;

-    }

-

-    public CustomerImpl getCustomerSdo() {

-        return customerSdo;

-    }

-

-    /**

-     * It is a method which injects the property value to the variable 'customerSdo' from the SCA runtime environment.

-     */

-    public void setCustomerSdo(CustomerImpl customerSdo) {

-        this.customerSdo = customerSdo;

-    }

-

-    /**

-     * This method is used to test injecting an Array

-     * 

-     * @return The injected array

-     */

-    public String[] getDaysOfTheWeek() {

-        return daysOfTheWeek;

-    }

-

-    /**

-     * This method is used to test injecting an Object Integer Array

-     * 

-     * @return The injected array

-     */

-    public Integer[] getIntegerNumbers() {

-        return integerNumbers;

-    }

-

-    /**

-     * This method is used to test injecting an int Array

-     * 

-     * @return The injected array

-     */

-    public int[] getIntNumbers() {

-        return intNumbers;

-    }

-

-    /**

-     * This method is used to test injecting an Object Array

-     * 

-     * @return The injected array

-     */

-    public DataObject[] getSdoArrayProperty() {

-        return sdoArray;

-    }

-    

-    public String getLocationFromComponentContext() {

-        return context.getProperty(String.class, "location");

-    }

-

-    public ReturnCodeProperties getComplexJAXBPropertyOne() {

-        return complexJAXBPropertyOne;

-    }

-

-    public ReturnCodeProperties getComplexJAXBPropertyTwo() {

-        return complexJAXBPropertyTwo;

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
deleted file mode 100644
index a57ccd90c8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.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 org.apache.tuscany.sca.itest;
-
-/**
- * This is an Interface for the services.
- */
-public interface PropertyService {
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
deleted file mode 100644
index c147a2affe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.cdi;
-
-public interface Bar {
-    public String getBar();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
deleted file mode 100644
index 0a84e93828..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.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 org.apache.tuscany.sca.itest.cdi;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(Bar.class)
-public class Foo1 implements Bar {
-
-    @Property
-    protected String bar;
-
-    @Constructor( {"bar"})
-    public Foo1(String b) {
-        this.bar = b;
-    }
-
-    public String getBar() {
-        return this.bar;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
deleted file mode 100644
index 6344a8aa83..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.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 org.apache.tuscany.sca.itest.cdi;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(Bar.class)
-public class Foo2 implements Bar {
-
-    protected String bar;
-
-    @Constructor
-    public Foo2(@Property(name = "bar") String b) {
-        this.bar = b;
-    }
-
-    public String getBar() {
-        return this.bar;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
deleted file mode 100644
index 11a0a758cd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ /dev/null
@@ -1,44 +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.itest.cdi;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(Bar.class)
-public class Foo3 implements Bar {
-
-    protected String bar;
-
-    @Constructor
-    public Foo3() {
-        this.bar = "bar";
-    }
-
-    public String getBar() {
-        return this.bar;
-    }
-
-    @Property(name = "bar")
-    public void setBar(String b) {
-        this.bar = b;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
deleted file mode 100644
index 76bcd06fca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ /dev/null
@@ -1,78 +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.    
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.06.07 at 03:30:47 PM EDT 
-//
-
-
-package test.jaxb.props;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the test.jaxb.props package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MyRCProps_QNAME = new QName("http://test.sca.jaxb/rcprops", "MyRCProps");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: test.jaxb.props
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ReturnCodeProperties }
-     * 
-     */
-    public ReturnCodeProperties createReturnCodeProperties() {
-        return new ReturnCodeProperties();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReturnCodeProperties }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://test.sca.jaxb/rcprops", name = "MyRCProps")
-    public JAXBElement<ReturnCodeProperties> createMyRCProps(ReturnCodeProperties value) {
-        return new JAXBElement<ReturnCodeProperties>(_MyRCProps_QNAME, ReturnCodeProperties.class, null, value);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
deleted file mode 100644
index 7a809ebf1e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ /dev/null
@@ -1,109 +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.    
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.06.07 at 03:30:47 PM EDT 
-//
-
-
-package test.jaxb.props;
-
-import java.math.BigInteger;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ReturnCodeProperties complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ReturnCodeProperties">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="AInt" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         &lt;element name="BInteger" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = {
-    "a",
-    "b"
-})
-public class ReturnCodeProperties {
-
-    @XmlElement(name = "AInt")
-    protected int a;
-    @XmlElement(name = "BInteger", required = true)
-    protected BigInteger b;
-
-    /**
-     * Gets the value of the a property.
-     * 
-     */
-    public int getA() {
-        return a;
-    }
-
-    /**
-     * Sets the value of the a property.
-     * 
-     */
-    public void setA(int value) {
-        this.a = value;
-    }
-
-    /**
-     * Gets the value of the b property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getB() {
-        return b;
-    }
-
-    /**
-     * Sets the value of the b property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setB(BigInteger value) {
-        this.b = value;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/package-info.java b/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/package-info.java
deleted file mode 100644
index f726552a62..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/java/test/jaxb/props/package-info.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.    
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.06.07 at 03:30:47 PM EDT 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://test.sca.jaxb/rcprops", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package test.jaxb.props;
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
deleted file mode 100644
index 70a251fa16..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ /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.    

--->

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

-	name="ConstructorPropertyInjection">

-

-	<component name="Foo1Component">

-		<implementation.java

-			class="org.apache.tuscany.sca.itest.cdi.Foo1" />

-		<property name="bar">fubar</property>

-	</component>

-

-	<component name="Foo2Component">

-		<implementation.java

-			class="org.apache.tuscany.sca.itest.cdi.Foo2" />

-		<property name="bar">fubar</property>

-	</component>

-

-	<component name="Foo3Component">

-		<implementation.java

-			class="org.apache.tuscany.sca.itest.cdi.Foo3" />

-		<property name="bar">fubar</property>

-	</component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/Outer.composite b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/Outer.composite
deleted file mode 100644
index b3e529e8b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/Outer.composite
+++ /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

- * 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"

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

-    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"

-    targetNamespace="http://foo" local="true" autowire="false">

-

-    <property name="newLocation" type="xsd:anyURI">Raleigh</property>

-    <property name="newYear" type="xsd:anyURI">2008</property>

-    <component name="MyServiceComponent">

-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />

-    </component>

-    <component name="MyServiceComponentNew">

-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />

-        <property name="location" source="$newLocation" />

-        <property name="year" source="$newYear" />

-    </component>

-    <component name="MyTotalServiceNewComponent">

-        <implementation.java class="mysca.test.myservice.impl.MyTotalServiceImpl" />

-        <reference name="myService" target="MyServiceComponentNew/MyService" />

-    </component>

-    <component name="MySimpleServiceInRecursiveAnother">

-        <implementation.composite name="foo:MySimpleService" />

-        <property name="newLocation">Durham</property>

-        <property name="newYear">2009</property>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/OuterPropertyTest.composite b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/OuterPropertyTest.composite
deleted file mode 100644
index 5237e964a3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ /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

- * 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:foo="http://foo"

-       targetNamespace="http://foo"

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

-           

-	<component name="OuterComponent">

-        <implementation.composite name="foo:PropertyTest"/>

-        <property name="number">125</property>

-        <property name="complex" type="foo:MyComplexType">

-	        <foo:MyComplexValue xsi:type="foo:MyComplexType" >

-	            <foo:a>Overriden A</foo:a>

-	            <foo:b>Overriden B</foo:b>

-	            <foo:c>Overriden C</foo:c>

-	            <foo:d>Overriden D</foo:d>

-	            <foo:x>

-	                <foo:y>Overriden Y</foo:y>

-	                <foo:z>Overriden Z</foo:z>

-	            </foo:x>

-	        </foo:MyComplexValue>

-    	</property>

-    </component>           

-</composite>

-

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/PropertyTest.composite b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/PropertyTest.composite
deleted file mode 100644
index 75deddbdad..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/PropertyTest.composite
+++ /dev/null
@@ -1,255 +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
- * 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:foo="http://foo" 
-       xmlns:cust="http://www.example.com/Customer"
-       xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:rcp="http://test.sca.jaxb/rcprops"
-       targetNamespace="http://foo"
-       name="PropertyTest"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-           
-    <service name="ProperterTestService" promote="ABComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.ABComponent"/>
-    </service>           
-           
-    <dbsdo:import.sdo location="customer.xsd" />
-    <!-- dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" / -->
-               
-    <property name="number" type="xsd:int">1</property>
-    <property name="complex" type="foo:MyComplexType" >
-        <foo:MyComplexValue xsi:type="foo:MyComplexType" >
-            <foo:a>a</foo:a>
-            <foo:b>b</foo:b>
-            <foo:c>c</foo:c>
-            <foo:d>d</foo:d>
-            <foo:x>
-                <foo:y>y</foo:y>
-                <foo:z>z</foo:z>
-            </foo:x>
-        </foo:MyComplexValue>
-    </property>
-
-    <property name="moreComplex" type="foo:MyMoreComplexType">
-        <MyMoreComplexValue xmlns="">
-            <numberSetArray>
-                <integerNumber>1</integerNumber>
-                <floatNumber>11</floatNumber>
-                <doubleNumber>111</doubleNumber>
-            </numberSetArray>
-            <numberSetArray>
-                <integerNumber>2</integerNumber>
-                <floatNumber>22</floatNumber>
-                <doubleNumber>222</doubleNumber>
-            </numberSetArray>
-            <stringArray>TestString_1</stringArray>
-            <stringArray>TestString_2</stringArray>
-            <intArray>10</intArray>
-            <intArray>20</intArray>
-            <integerNumber>27</integerNumber>
-            <floatNumber>79.34</floatNumber>
-            <doubleNumber>184.52</doubleNumber>
-            <doubleArray>50.05</doubleArray>
-            <doubleArray>25.52</doubleArray>
-            <numberSet>
-                <integerNumber>54</integerNumber>
-                <floatNumber>158.68</floatNumber>
-                <doubleNumber>369.04</doubleNumber>
-            </numberSet>
-        </MyMoreComplexValue>
-    </property>
-    
-    <property name="complexFoo" type="foo:MyMoreComplexType">
-        <MyMoreComplexValue xmlns="">
-            <stringArray>TestString_3</stringArray>
-            <stringArray>TestString_4</stringArray>
-            <intArray>100</intArray>
-            <intArray>200</intArray>
-        </MyMoreComplexValue>
-    </property>
-
-    <component name="ABCDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
-        <reference name="ab" target="ABComponent"/>
-        <reference name="cd" target="CDComponent"/>
-    </component>
-
-    <component name="ABComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
-        <property name="a" source="$complex/foo:MyComplexValue/foo:a"/>
-        <property name="b" source="$complex/foo:MyComplexValue/foo:b"/>
-        <property name="f" source="$complex/foo:MyComplexValue/foo:a">f</property>
-        <property name="xpath" source="$complex/foo:MyComplexValue/foo:x/*[local-name()='z']"/>
-        <property name="one" source="$number"/>
-        <property name="foobar" many="true">"Apache" "Tuscany" "Java SCA"</property>
-        <property name="fooInts" many="true">123 456 789</property>
-    </component>
-    
-
-    <component name="CDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
-        <property name="c" source="$complex/foo:MyComplexValue/foo:c"/>
-        <property name="d" source="$complex/foo:MyComplexValue/foo:d"/>
-        <property name="nosource">aValue</property>
-        <property name="fileProperty" file="fileProperty.txt"/>
-        <property name="manyValuesFileProperty" many="true" file="manyValuesFileProperty.txt"/>
-        <property name="nonFileProperty"  file="fileProperty.txt" source="$complex/foo:MyComplexValue/foo:c"/>
-        <property name="two" source="$number">25</property>
-    </component>
-
-    <component name="PropertyComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/>
-        <property name="complexPropertyOne" source="$moreComplex"></property>
-        <property name="complexPropertyTwo">
-            <MyAnotherComplexValue xmlns="">
-                <stringArray>TestString_1</stringArray>
-                <stringArray>TestString_2</stringArray>
-                <intArray>10</intArray>
-                <integerNumber>27</integerNumber>
-                <floatNumber>79.34</floatNumber>
-                <doubleArray>25.52</doubleArray>
-                <doubleNumber>184.52</doubleNumber>
-                <doubleArray>50.05</doubleArray>
-                <intArray>20</intArray>
-                <numberSetArray>
-                    <integerNumber>1</integerNumber>
-                    <floatNumber>11</floatNumber>
-                    <doubleNumber>111</doubleNumber>
-                </numberSetArray>
-                <numberSetArray>
-                    <integerNumber>2</integerNumber>
-                    <floatNumber>22</floatNumber>
-                    <doubleNumber>222</doubleNumber>
-                </numberSetArray>
-                <numberSet>
-                    <integerNumber>54</integerNumber>
-                    <floatNumber>158.68</floatNumber>
-                    <doubleNumber>369.04</doubleNumber>
-                </numberSet>
-            </MyAnotherComplexValue>
-        </property>
-        <property name="complexPropertyThree" element="foo:PropertyThreeElement">
-            <PropertyThreeElement xmlns="">
-                <stringArray>TestElementString_1</stringArray>
-                <stringArray>TestElementString_2</stringArray>
-                <intArray>10</intArray>
-                <integerNumber>27</integerNumber>
-                <floatNumber>79.34</floatNumber>
-                <doubleArray>25.52</doubleArray>
-                <doubleNumber>184.52</doubleNumber>
-                <doubleArray>50.05</doubleArray>
-                <intArray>20</intArray>
-                <numberSetArray>
-                    <integerNumber>1</integerNumber>
-                    <floatNumber>11</floatNumber>
-                    <doubleNumber>111</doubleNumber>
-                </numberSetArray>
-                <numberSetArray>
-                    <integerNumber>2</integerNumber>
-                    <floatNumber>22</floatNumber>
-                    <doubleNumber>222</doubleNumber>
-                </numberSetArray>
-                <numberSet>
-                    <integerNumber>54</integerNumber>
-                    <floatNumber>158.68</floatNumber>
-                    <doubleNumber>369.04</doubleNumber>
-                </numberSet>
-            </PropertyThreeElement>
-        </property>
-        <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true">
-            <PropertyFourElement xmlns="">
-                <integerNumber>1</integerNumber>
-                <floatNumber>11.11</floatNumber>
-                <doubleNumber>111.111</doubleNumber>
-                <numberSet>
-                    <integerNumber>11</integerNumber>
-                    <floatNumber>1111.1111</floatNumber>
-                    <doubleNumber>11111.11111</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-            <PropertyFourElement xmlns="">
-                <integerNumber>2</integerNumber>
-                <floatNumber>22.22</floatNumber>
-                <doubleNumber>222.222</doubleNumber>
-                <numberSet>
-                    <integerNumber>22</integerNumber>
-                    <floatNumber>2222.2222</floatNumber>
-                    <doubleNumber>22222.22222</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-            <PropertyFourElement xmlns="">
-                <integerNumber>3</integerNumber>
-                <floatNumber>33.33</floatNumber>
-                <doubleNumber>333.333</doubleNumber>
-                <numberSet>
-                    <integerNumber>33</integerNumber>
-                    <floatNumber>3333.3333</floatNumber>
-                    <doubleNumber>33333.33333</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-        </property>
-        <property name="complexPropertyFive" source="$complexFoo"/>
-        <property name="sdoProperty" type="cust:Customer">	
-        	<cust:customer>
-        		<cust:firstName>Firstly Name</cust:firstName>
-        		<cust:middleName>Middler Name</cust:middleName>
-        		<cust:lastName>Lasting Name</cust:lastName>
-       		</cust:customer>
-        </property>
-        <property name="customerSdo" type="cust:Customer">	
-        	<cust:customer>
-        		<cust:firstName>Sdo Firstly Name</cust:firstName>
-        		<cust:middleName>Sdo Middler Name</cust:middleName>
-        		<cust:lastName>Sdo Lasting Name</cust:lastName>
-       		</cust:customer>
-        </property>
-        <property name="location" type="xsd:string">RTP</property>	
-        <property name="year" type="xsd:string">2006</property>	
-        <property name="daysOfTheWeek" many="true" type="xsd:string">"Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday" "Sunday"</property>
-        <property name="integerNumbers" many="true" type="xsd:int">1 2 3 4 5 6 7 8 9 10</property>
-        <property name="intNumbers" many="true" type="xsd:int">10 9 8 7 6 5 4 3 2 1 0</property>
-        <property name="sdoArray" many="true" type="cust:Customer">
-            <cust:customer>
-                <cust:firstName>Firstly Name 1</cust:firstName>
-                <cust:middleName>Middler Name 1</cust:middleName>
-                <cust:lastName>Lasting Name 1</cust:lastName>
-            </cust:customer>
-            <cust:customer>
-                <cust:firstName>Firstly Name 2</cust:firstName>
-                <cust:middleName>Middler Name 2</cust:middleName>
-                <cust:lastName>Lasting Name 2</cust:lastName>
-            </cust:customer>
-            <cust:customer>
-                <cust:firstName>Firstly Name 3</cust:firstName>
-                <cust:middleName>Middler Name 3</cust:middleName>
-                <cust:lastName>Lasting Name 3</cust:lastName>
-            </cust:customer>
-        </property>
-        <property name="complexJAXBPropertyOne" type="rcp:ReturnCodeProperties">
-            <MyRCProps xmlns="http://test.sca.jaxb/rcprops">
-                <AInt>10</AInt>
-                <BInteger>10</BInteger>
-            </MyRCProps>
-        </property>
-        <property name="complexJAXBPropertyTwo" type="rcp:ReturnCodeProperties" file="rcProps.txt"/>
-    </component>
-</composite>
-
-
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/customer.xsd b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/customer.xsd
deleted file mode 100644
index 8861d7e7b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/customer.xsd
+++ /dev/null
@@ -1,30 +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.    

--->

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

-    xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer">

-

-    <xsd:element name="customer" type="Customer"/>

-    <xsd:complexType name="Customer">

-        <xsd:sequence>

-            <xsd:element name="firstName"  type="xsd:string"/>

-            <xsd:element name="middleName" type="xsd:string"/>

-            <xsd:element name="lastName"   type="xsd:string"/>

-        </xsd:sequence>

-    </xsd:complexType>

- </xsd:schema>

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/fileProperty.txt b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/fileProperty.txt
deleted file mode 100644
index 0d3d9ead83..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/fileProperty.txt
+++ /dev/null
@@ -1,21 +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.
--->
-
-<filePropertyTest>fileValue</filePropertyTest>
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/manyValuesFileProperty.txt b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/manyValuesFileProperty.txt
deleted file mode 100644
index 450f397b30..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ /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.

--->

-

-<manyFilePropertyValues>

-	"fileValueOne" "fileValueTwo" "fileValueThree" "fileValueFour"

-</manyFilePropertyValues>

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/mySimpleService.composite b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/mySimpleService.composite
deleted file mode 100644
index 75fdd24add..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/mySimpleService.composite
+++ /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.    

--->

-<composite autowire="false" local="true" name="MySimpleService"

-    targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://www.osoa.org/xmlns/sca/1.0"

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

-    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">

-

-

-    <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">

-        <interface.java interface="mysca.test.myservice.impl.MyService" />

-    </service>

-

-    <property name="newLocation" type="xsd:anyURI">Raleigh</property>

-    <property name="newYear" type="xsd:anyURI">2008</property>

-

-

-    <component name="MyServiceComponentNew">

-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />

-        <property name="location" source="$newLocation" />

-        <property name="year" source="$newYear" />

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/rcProps.txt b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/rcProps.txt
deleted file mode 100644
index 052c291fd0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/rcProps.txt
+++ /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
- * 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.
--->
-<MyRCProps xmlns="http://test.sca.jaxb/rcprops">
-    <AInt>20</AInt>
-    <BInteger>20</BInteger>
-</MyRCProps>
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/rcprops.xsd b/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/rcprops.xsd
deleted file mode 100644
index 21289fa7b2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/main/resources/rcprops.xsd
+++ /dev/null
@@ -1,55 +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
- * 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 elementFormDefault="qualified" targetNamespace="http://test.sca.jaxb/rcprops"
-    xmlns:tns="http://test.sca.jaxb/rcprops" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
-    xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-    <!-- Use some JAXB customizations -->
-
-    <annotation>
-        <appinfo>
-            <jaxb:schemaBindings>
-                <jaxb:package name="test.jaxb.props" />
-            </jaxb:schemaBindings>
-        </appinfo>
-    </annotation>
-
-    <element name="MyRCProps" type="tns:ReturnCodeProperties" />
-
-    <complexType name="ReturnCodeProperties">
-        <sequence>
-            <element name="AInt" type="xsd:int">
-                <annotation>
-                    <appinfo>
-                        <jaxb:property name="a" />
-                    </appinfo>
-                </annotation>
-            </element>
-            <element name="BInteger" type="xsd:integer">
-                <annotation>
-                    <appinfo>
-                        <jaxb:property name="b" />
-                    </appinfo>
-                </annotation>
-            </element>
-        </sequence>
-    </complexType>
-</schema>
-
-
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
deleted file mode 100644
index 8cf182e24a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ /dev/null
@@ -1,99 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import mysca.test.myservice.impl.MyService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MyTotalServiceTestCase {
-    private static MyService service1;
-    private static MyService service2;
-    private static MyService service3;
-
-    private static SCADomain domain;
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the local
-     *       property variables defined in the implementation file with the expected values 'RTP' and '2006'
-     */
-    @Test
-    public void testPropertyDefault() {
-        assertEquals("RTP", service1.getLocation());
-        assertEquals("2006", service1.getYear());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using service2 from the SCA runtime environment with the expected values 'Raleigh'
-     *       and '2008'. This overrides the local property values
-     */
-    @Test
-    public void testPropertyOverride() {
-        assertEquals("Raleigh", service2.getLocation());
-        assertEquals("2008", service2.getYear());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using service3 from the SCA runtime environment with the expected values 'Durham'
-     *       and '2009'
-     */
-    @Test
-    public void testPropertyNestedOverride() {
-        assertEquals("Durham", service3.getLocation());
-        assertEquals("2009", service3.getYear());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test
-     *              Embedded SCA Domain, to start the SCA Domain and to get a reference to the 'outerABService' service
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-
-        domain = SCADomain.newInstance("Outer.composite");
-        service1 = domain.getService(MyService.class, "MyServiceComponent/MyService");
-        service2 = domain.getService(MyService.class, "MyServiceComponentNew/MyService");
-        service3 = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother");
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the
-     *             domain, close any previously opened connections etc
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
deleted file mode 100644
index 28357c5bbe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ /dev/null
@@ -1,164 +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.itest;

-

-import static junit.framework.Assert.assertEquals;

-

-import java.util.Iterator;

-

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-/**

- * This is a class which makes user of JUnit Framework, all tests are written using JUnit notation. These tests are used

- * to test different property values returned from the SCA Runtime Environment which is initialized with the composite

- * 'OuterPropertyTest.composite'. It basically tests the Simple type of property and Complex type of property from the

- * SCA Runtime Environment.

- */

-public class OuterPropertyTestCase {

-

-    private static SCADomain domain;

-    private static ABComponent outerABService;

-

-    /**

-     * Method annotated with

-     * 

-     * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test

-     *              Embedded SCA Domain, to start the SCA Domain and to get a reference to the 'outerABService' service

-     */

-    @BeforeClass

-    public static void init() throws Exception {

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

-        outerABService = domain.getService(ABComponent.class, "OuterComponent");

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the

-     *             domain, close any previously opened connections etc

-     */

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       A'

-     */

-    @Test

-    public void testOverridenA() {

-        assertEquals("Overriden A", outerABService.getA());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       B'

-     */

-    @Test

-    public void testOverridenB() {

-        assertEquals("Overriden B", outerABService.getB());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       A'

-     */

-    @Test

-    public void testOverridenF() {

-        assertEquals("Overriden A", outerABService.getF());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       Z'

-     */

-    @Test

-    public void testOverridenZ() {

-        assertEquals("Overriden Z", outerABService.getZ());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 125

-     */

-    @Test

-    public void testOverridenIntValue() {

-        assertEquals(125, outerABService.getIntValue());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 125

-     */

-    @Test

-    public void testDefaultValue() {

-        assertEquals(125, outerABService.getIntValue());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property values obtained using a service from the SCA runtime environment with the expected values 'Apache' ,

-     *       'Tuscany' and 'Java SCA' respectively .

-     */

-    @Test

-    public void testManySimpleStringValues() {

-        Iterator<String> iterator = outerABService.getManyStringValues().iterator();

-        assertEquals("Apache", iterator.next());

-        assertEquals("Tuscany", iterator.next());

-        assertEquals("Java SCA", iterator.next());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property values obtained using a service from the SCA runtime environment with the expected values 123, 456

-     *       and 789

-     */

-    @Test

-    public void testManySimpleIntegerValues() {

-        Iterator<Integer> iterator = outerABService.getManyIntegers().iterator();

-        assertEquals(123, iterator.next().intValue());

-        assertEquals(456, iterator.next().intValue());

-        assertEquals(789, iterator.next().intValue());

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
deleted file mode 100644
index 6979659ece..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ /dev/null
@@ -1,468 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import java.math.BigInteger;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import test.jaxb.props.ReturnCodeProperties;
-import commonj.sdo.DataObject;
-
-/**
- * This is a class which makes user of JUnit Framework, all tests are written using JUnit notation. These tests are used
- * to test different property values returned from the SCA Runtime Environment which is initialized with the composite
- * 'PropertyTest.composite'. It basically tests all types of property values returned from SCA runtime environment.
- */
-public class PropertyTestCase {
-    private static SCADomain domain;
-    private static ABComponent abService;
-    private static CDComponent cdService;
-    private static ABCDComponent abcdService;
-    private static PropertyComponent propertyService;
-
-
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'a'
-     */
-    @Test
-    public void testA() {
-        assertEquals("a", abService.getA());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'b'
-     */
-    @Test
-    public void testB() {
-        assertEquals("b", abService.getB());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'c'
-     */
-    @Test
-    public void testC() {
-        assertEquals("c", cdService.getC());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'c'
-     */
-    @Test
-    public void testC2() {
-        assertEquals("c", cdService.getC2());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'd'
-     */
-    @Test
-    public void testD() {
-        assertEquals("d", cdService.getD());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'a'
-     */
-    @Test
-    public void testF() {
-        assertEquals("a", abService.getF());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'z'
-     */
-    @Test
-    public void testZ() {
-        assertEquals("z", abService.getZ());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 1.
-     */
-    @Test
-    public void testIntValue() {
-        assertEquals(1, abService.getIntValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 1.
-     */
-    @Test
-    public void testDefaultValue() {
-        assertEquals(1, abService.getIntValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 1.
-     */
-    @Test
-    public void testDefaultValueOverride() {
-        assertEquals(1, cdService.getOverrideValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'aValue'
-     */
-    @Test
-    public void testNoSource() {
-        assertEquals("aValue", cdService.getNoSource());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value
-     *       'fileValue'
-     */
-    @Test
-    public void testFileProperty() {
-        assertEquals("fileValue", cdService.getFileProperty());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 4 and
-     *       'fileValueTwo' respectively.
-     */
-    @Test
-    public void testManyValuesFileProperty() {
-        Iterator<String> iterator = cdService.getManyValuesFileProperty().iterator();
-        iterator.next();
-        String secondValue = iterator.next();
-        assertEquals(4, cdService.getManyValuesFileProperty().size());
-        assertEquals("fileValueTwo", secondValue);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 'a' ,
-     *       'b', 'c' and 'd' respectively.
-     */
-    @Test
-    public void testABCD() {
-        assertEquals("a", abcdService.getA());
-        assertEquals("b", abcdService.getB());
-        assertEquals("c", abcdService.getC());
-        assertEquals("d", abcdService.getD());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 'RTP'
-     *       and '2006' respectively
-     */
-    @Test
-    public void testDefaultProperty() {
-        assertEquals("RTP", propertyService.getLocation());
-        assertEquals("2006", propertyService.getYear());
-
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 'Apache' ,
-     *       'Tuscany' and 'Java SCA' respectively .
-     */
-    @Test
-    public void testManySimpleStringValues() {
-        Iterator<String> iterator = abService.getManyStringValues().iterator();
-        assertEquals("Apache", iterator.next());
-        assertEquals("Tuscany", iterator.next());
-        assertEquals("Java SCA", iterator.next());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 123, 456
-     *       and 789 respectively.
-     */
-    @Test
-    public void testManySimpleIntegerValues() {
-        Iterator<Integer> iterator = abService.getManyIntegers().iterator();
-        assertEquals(123, iterator.next().intValue());
-        assertEquals(456, iterator.next().intValue());
-        assertEquals(789, iterator.next().intValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values
-     *       'TestString_1' and 2 respectively.
-     */
-    @Test
-    public void testComplexPropertyOne() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyOne();
-        assertNotNull(propBean);
-        assertEquals("TestString_1", propBean.getStringArray()[0]);
-        assertEquals(2, propBean.numberSetArray[1].integerNumber);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected integer number
-     *       and a float number
-     */
-    @Test
-    public void testComplexPropertyTwo() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyTwo();
-        assertNotNull(propBean);
-        assertEquals(10, propBean.intArray[0]);
-        assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected value first
-     *       element in the string array and the float number
-     */
-    @Test
-    public void testComplexPropertyThree() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyThree();
-        assertNotNull(propBean);
-        assertEquals("TestElementString_1", propBean.stringArray[0]);
-        assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       complex property value obtained using a service from the SCA runtime environment with the expected values
-     *       1, 222.222 and 33 respectively.
-     */
-    @Test
-    public void testComplexPropertyFour() {
-        Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray();
-        assertNotNull(propBeanCollection);
-        assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber());
-        assertEquals(222.222, ((ComplexPropertyBean)propBeanCollection[1]).getDoubleNumber());
-        assertEquals(33, ((ComplexPropertyBean)propBeanCollection[2]).getNumberSet().getIntegerNumber());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values
-     *       'TestString_3', 'TestString_4', 100 and 200.
-     */
-    @Test
-    public void testComplexPropertyFive() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyFive();
-        assertNotNull(propBean);
-        assertEquals("TestString_3", propBean.getStringArray()[0]);
-        assertEquals("TestString_4", propBean.getStringArray()[1]);
-        assertEquals(100, propBean.getIntArray()[0]);
-        assertEquals(200, propBean.getIntArray()[1]);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected string values
-     *       'Firstly Name' , 'Middler Name' and 'Lasting Name' respectively
-     */
-    @Test
-    public void testSDOProperty1() {
-        DataObject dataObject = propertyService.getSdoProperty();
-        assertNotNull(dataObject);
-        assertEquals("Firstly Name", dataObject.get("firstName"));
-        assertEquals("Middler Name", dataObject.getString("middleName"));
-        assertEquals("Lasting Name", dataObject.getString("lastName"));
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected string values
-     *       'Sdo Firstly Name', 'Sdo Middler Name' and 'Sdo Lasting Name' respectively
-     */
-    @Test
-    public void testSDOProperty2() {
-        DataObject dataObject = propertyService.getCustomerSdo();
-        assertNotNull(dataObject);
-        assertEquals("Sdo Firstly Name", dataObject.get("firstName"));
-        assertEquals("Sdo Middler Name", dataObject.getString("middleName"));
-        assertEquals("Sdo Lasting Name", dataObject.getString("lastName"));
-    }
-     
-
-    @Test
-    public void testGetLocationFromComponentContext() {
-        String location = propertyService.getLocation();
-        assertNotNull(location);
-        String locationFromCC = propertyService.getLocationFromComponentContext();
-        assertNotNull(locationFromCC);
-        assertEquals(location, locationFromCC);
-    }
-
-    @Test
-    public void testGetInjectedStringArrayProperty() {
-        String[] daysOfWeek = propertyService.getDaysOfTheWeek();
-        assertNotNull(daysOfWeek);
-
-        String[] expected = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"};
-        Assert.assertTrue(Arrays.equals(expected, daysOfWeek));
-    }
-
-    @Test
-    public void testGetInjectedIntegerArrayProperty() {
-        Integer[] numbers = propertyService.getIntegerNumbers();
-        assertNotNull(numbers);
-
-        Integer[] expected = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        Assert.assertTrue(Arrays.equals(expected, numbers));
-    }
-
-    @Test
-    public void testGetInjectedIntArrayProperty() {
-        int[] numbers = propertyService.getIntNumbers();
-        assertNotNull(numbers);
-
-        int[] expected = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
-        Assert.assertTrue(Arrays.equals(expected, numbers));
-    }
-
-    @Test
-    public void testGetInjectedSdoArrayProperty() {
-        DataObject[] sdos = propertyService.getSdoArrayProperty();
-        assertNotNull(sdos);
-
-        for (int i = 1; i <= 3; i++) {
-            DataObject dataObject = sdos[i - 1];
-            assertEquals("Firstly Name " + i, dataObject.get("firstName"));
-            assertEquals("Middler Name " + i, dataObject.getString("middleName"));
-            assertEquals("Lasting Name " + i, dataObject.getString("lastName"));
-        }
-    }
-
-    @Test
-    public void testComplexJAXBProperty() {
-        ReturnCodeProperties rc = propertyService.getComplexJAXBPropertyOne();
-        assertEquals(10, rc.getA());
-        assertEquals(new BigInteger("10"), rc.getB());
-    }
-
-    @Test
-    public void testComplexJAXBPropertyFromFile() {
-        ReturnCodeProperties rc = propertyService.getComplexJAXBPropertyTwo();
-        System.out.println("SKSK: a =" + rc.getA());
-        System.out.println("SKSK: b =" + rc.getB());
-        assertEquals(20, rc.getA());
-        assertEquals(new BigInteger("20"), rc.getB());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test
-     *              Embedded SCA Domain, to start the SCA Domain and to get a reference to 4 services namely 'abService'
-     *              service, 'cdService' service, 'abcdService' service and 'propertyService' service
-     */
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("PropertyTest.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        abService = domain.getService(ABComponent.class, "ABComponent");
-        cdService = domain.getService(CDComponent.class, "CDComponent");
-        abcdService = domain.getService(ABCDComponent.class, "ABCDComponent");
-        propertyService = domain.getService(PropertyComponent.class, "PropertyComponent");
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the
-     *             domain, close any previously opened connections etc
-     */
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
deleted file mode 100644
index 8ee5dce91f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ /dev/null
@@ -1,44 +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.itest.cdi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ConstructorPropertyInjectionTestCase extends TestCase {
-
-    public void testFoo1() throws Exception {
-        SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite");
-        Bar foo = sca.getService(Bar.class, "Foo1Component");
-        assertEquals("fubar", foo.getBar());
-    }
-
-    public void testFoo2() throws Exception {
-        SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite");
-        Bar foo = sca.getService(Bar.class, "Foo2Component");
-        assertEquals("fubar", foo.getBar());
-    }
-
-    public void testFoo3() throws Exception {
-        SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite");
-        Bar foo = sca.getService(Bar.class, "Foo3Component");
-        assertEquals("fubar", foo.getBar());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/pom.xml b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/pom.xml
deleted file mode 100644
index 373ad4155e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <!--relativePath>../pom.xml</relativePath-->
-    </parent>
-    <artifactId>itest-recursive-multi-level</artifactId>
-    <name>Apache Tuscany SCA Recusive Multi-Level Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>       
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
deleted file mode 100644
index 214d4d8a1f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ /dev/null
@@ -1,26 +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 mysca.test.myservice;
-
-
-public interface MyService {
-    String getLocation();
-    String getYear();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
deleted file mode 100644
index 51948a3b81..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.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 mysca.test.myservice;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-import mysca.test.myservice.MyService;
-
-@Service(MyService.class)
-public class MyServiceImpl implements MyService {
-	
-	@Property(name="location")
-	protected String location = "ABC";
-
-    @Property(name="year")
-    protected String year = "2006";
-    
-
-    public String getLocation()
-    {
-       return location;
-    }
-
-    public String getYear()
-    {
-        return year;
-    }
-	
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
deleted file mode 100644
index 08df8ade17..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.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 mysca.test.myservice;
-
-public interface MySimpleTotalService {
-    String getLocation();
-    String getYear();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
deleted file mode 100644
index 2ad9f815f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ /dev/null
@@ -1,46 +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 mysca.test.myservice;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import mysca.test.myservice.MyService;
-import mysca.test.myservice.MySimpleTotalService;
-
-@Service(MySimpleTotalService.class)
-public class MySimpleTotalServiceImpl implements MySimpleTotalService
-{
-    // default required==true so it is 1:1
-    @Reference
-    public MyService myService;
-
-
-    public String getLocation()
-    {
-        return myService.getLocation();
-    }
-
-    public String getYear()
-    {
-        return myService.getYear();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
deleted file mode 100644
index 975f61c664..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ /dev/null
@@ -1,52 +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:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-           xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:foo="http://foo" 
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 
-           name="TotalComposite1Auto"
-           targetNamespace="http://foo" 
-           local="true" 
-           autowire="false">
-
-    <property name="newLocation" type="xsd:anyURI">Level 1</property>
-    <property name="newYear" type="xsd:anyURI">2001</property>
-
-    <component name="ServiceComponentLevel1Auto">
-        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
-        <property name="location" source="$newLocation"/>
-        <property name="year" source="$newYear"/>
-    </component>
-
-    <service name="MyServiceLevel1Auto" promote="TotalServiceComponentLevel1Auto/MySimpleTotalService">
-        <interface.java interface="mysca.test.myservice.MySimpleTotalService"/>
-    </service>
-    
-    <component name="TotalServiceComponentLevel1Auto">
-        <implementation.java class="mysca.test.myservice.MySimpleTotalServiceImpl"/>
-        <reference name="myService" autowire="true"/>
-    </component>
-
-    <reference name="myServiceReference1Auto" promote="TotalServiceComponentLevel1Auto/myService">
-        <interface.java interface="mysca.test.myservice.MyService"/>
-   </reference>
-</composite>
-
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
deleted file mode 100644
index f9bbcc76d8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ /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.    
- -->
-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-           xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:foo="http://foo" 
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 
-           name="TotalComposite2Auto"
-           targetNamespace="http://foo" 
-           local="true" 
-           autowire="false">
-    
-    <property name="newLocation" type="xsd:anyURI">Level 2</property>
-    <property name="newYear" type="xsd:anyURI">2002</property>
-  
-    <component name="ServiceComponentLevel2Auto">
-        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
-        <property name="location">Default 2</property>
-        <property name="year">1992</property>
-    </component>
-  
-    <service name="MyServiceLevel2Auto" promote="TotalServiceInRecursive2Auto/MyServiceLevel1Auto"/>
-  
-    <component name="TotalServiceInRecursive2Auto">
-        <implementation.composite name="foo:TotalComposite1Auto"/>
-        <reference name="myServiceReference1Auto" autowire="true"/>
-        <property name="newLocation" source="$newLocation"/>
-        <property name="newYear" source="$newYear"/>
-    </component>
-  
-    <reference name="myServiceReference2Auto" promote="TotalServiceInRecursive2Auto/myServiceReference1Auto"/>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
deleted file mode 100644
index 09fd10fb7e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ /dev/null
@@ -1,52 +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:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-           xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:foo="http://foo" 
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 
-           name="TotalComposite3Auto"
-           targetNamespace="http://foo" 
-           local="true" 
-           autowire="false">
-
-    <property name="newLocation" type="xsd:anyURI">Level 3</property>
-    <property name="newYear" type="xsd:anyURI">2003</property>
-
-    <component name="ServiceComponentLevel3Auto">
-        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
-        <property name="location">Default 3</property>
-        <property name="year">1993</property>
-    </component>
-  
-    <service name="MyServiceLevel3Auto" promote="TotalServiceInRecursive3Auto/MyServiceLevel2Auto">
-    </service>
-
-    <component name="TotalServiceInRecursive3Auto" autowire="true">
-        <implementation.composite name="foo:TotalComposite2Auto"/>
-        <reference name="myServiceReference2Auto"/>
-        <property name="newLocation" source="$newLocation"/>
-        <property name="newYear" source="$newYear"/>
-    </component>
-    
-    <reference name="myServiceReference3Auto" promote="TotalServiceInRecursive3Auto/myServiceReference2Auto">
-    </reference>
-
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
deleted file mode 100644
index d8d6fe0dc5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ /dev/null
@@ -1,68 +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 test.sca.tests;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import mysca.test.myservice.MySimpleTotalService;
-import junit.framework.TestCase;
-
-
-/**
- * Tests to make sure that autowiring and recusive composite work together
- *
- */
-public class MultiLevelTestCase extends TestCase
-{
-    private SCADomain domain1;
-    private SCADomain domain2;
-    private SCADomain domain3;
-    private MySimpleTotalService myService1;
-    private MySimpleTotalService myService2;
-    private MySimpleTotalService myService3;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        domain1 = SCADomain.newInstance("TotalService1Auto.composite");
-        domain2 = SCADomain.newInstance("TotalService2Auto.composite");
-        domain3 = SCADomain.newInstance("TotalService3Auto.composite");
-
-        myService1 = domain1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto");
-        myService2 = domain2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto");
-        myService3 = domain3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto");
-    }
-   
-    public void testLevel1()
-    {
-        assertEquals("Level 1",myService1.getLocation());
-        assertEquals("2001",myService1.getYear());
-    }
-    
-    public void testLevel2()
-    {
-        assertEquals("Default 2",myService2.getLocation());
-        assertEquals("1992",myService2.getYear());
-    }
-
-    public void testLevel3()
-    {
-        assertEquals("Default 3",myService3.getLocation());
-        assertEquals("1993",myService3.getYear());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/pom.xml b/tags/java/sca/1.3-RC1a/itest/recursive-ws/pom.xml
deleted file mode 100644
index bf97ecccc6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-recursive-ws</artifactId>
-    <name>Apache Tuscany SCA Recursive WS Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced -->
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                    <version>1.3</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/Target.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/Target.java
deleted file mode 100644
index c77fcea868..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/Target.java
+++ /dev/null
@@ -1,26 +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 policy;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index 87e412829e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ /dev/null
@@ -1,33 +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 policy;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetClientImpl implements Target {
-
-    @Reference
-    protected Target targetService;
-
-    public String hello(String arg) {
-        return "Target: Hello " + targetService.hello(arg) + "!";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index e565055252..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ /dev/null
@@ -1,29 +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 policy;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/Composer.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/Composer.java
deleted file mode 100644
index e53f99d9c3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ /dev/null
@@ -1,26 +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 recursive;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Composer {
-    public String Compose(String s);
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
deleted file mode 100644
index 7956d153cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ /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.    
- */
-package recursive;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *  For testing purpose
- */
-public class ComposerClient {
-
-    public final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("Client.composite");
-        Composer composer = scaDomain.getService(Composer.class, "ClientComponent/Composer");
-        System.out.println(composer.Compose("ABC"));
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
deleted file mode 100644
index 3d75b7b165..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.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 recursive;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComposerClientImpl implements Composer {
-    @Reference
-    protected Composer composerWS;
-    
-    /**
-     * @see recursive.Composer#Compose(java.lang.String)
-     */
-    public String Compose(String s) {
-        return composerWS.Compose(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
deleted file mode 100644
index 8b77484922..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ /dev/null
@@ -1,34 +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 recursive;
-
-/**
- * Composer Component Implementation
- * 
- */
-
-public class ComposerImpl implements Composer {
-
-    public String Compose(String s) {
-        System.out.println("Composing " + s + "...");
-        return "Composed: " + s;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
deleted file mode 100644
index 5035d1cbd9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ /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.    
- */
-package recursive;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *  For testing purpose
- */
-public class ComposerServer {
-
-    public final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("Outer.composite");
-        System.out.println("Press Enter to exit...");
-        System.in.read();
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Client.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Client.composite
deleted file mode 100644
index 56d7c01377..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Client.composite
+++ /dev/null
@@ -1,28 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://client" name="Client">

-    <component name="ClientComponent">

-        <implementation.java class="recursive.ComposerClientImpl" />

-        <reference name="composerWS">

-            <binding.ws uri="http://localhost:8085/OuterService"/>

-        </reference>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Inner.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Inner.composite
deleted file mode 100644
index b054ae0944..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://inner" name="Inner">

-    <component name="InnerComponent">

-        <implementation.java class="recursive.ComposerImpl" />

-    </component>

-    <service name="OuterService" promote="InnerComponent"/>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Outer.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Outer.composite
deleted file mode 100644
index 3c3f327b28..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/Outer.composite
+++ /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.    

--->

-

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

-    name="Outer">

-    <component name="OuterComponent">

-        <implementation.composite name="inner:Inner" />

-        <service name="OuterService">

-            <interface.java interface="recursive.Composer" />

-            <binding.ws uri="http://localhost:8085/OuterService" />

-        </service>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
deleted file mode 100644
index b5c180919c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://bindingoverride"
-    xmlns:bindingoverride="http://bindingoverride"
-    name="BindingOverrideInnerComposite">
-
-   	<service name="InnerService" promote="InnerServiceComponent"> 
-            <interface.java interface="policy.Target"/>
-    </service>
-	
-    <component name="InnerServiceComponent">
-		<implementation.java class="policy.TargetServiceImpl"/> 
-        <service name="Target">
-            <interface.java interface="policy.Target"/>
-        </service>		
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
deleted file mode 100644
index 891cac0b79..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://bindingoverride"
-    xmlns:bindingoverride="http://bindingoverride"
-    name="BindingOverrideOuterComposite">
-    
-    <component name="OuterClientComponent">
-        <implementation.java class="policy.TargetClientImpl"/>
-        <reference name="targetService" target="OuterServiceComponent">
-            <binding.ws/>
-        </reference>
-    </component>
-    
-    <component name="OuterServiceComponent">
-        <implementation.composite name="bindingoverride:BindingOverrideInnerComposite"/>
-        <service name="InnerService">
-            <interface.java interface="policy.Target"/>
-            <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4b398743eb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://policy"

-    xmlns:policy="http://policy"

-    name="PolicyInnerComposite">

-

-   	<service name="TargetService" promote="TargetServiceComponent"> 

-            <interface.java interface="policy.Target"/>

-    </service>

-	

-    <component name="TargetServiceComponent">

-		<implementation.java class="policy.TargetServiceImpl"/> 

-        <service name="Target">

-            <interface.java interface="policy.Target"/>

-            <binding.ws uri="http://localhost:8085/TargetServiceComponent"/>

-        </service>		

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index b50bc29a1f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://policy"
-    xmlns:policy="http://policy"
-    name="PolicyOuterComposite"
-    requires="policy:TestIntent_1">
-    
-    <component name="TargetClientComponent">
-        <implementation.java class="policy.TargetClientImpl"/>
-        <reference name="targetService" target="OuterTargetServiceComponent">
-            <binding.ws/>
-        </reference>
-    </component>
-    
-    <component name="OuterTargetServiceComponent">
-        <implementation.composite name="policy:PolicyInnerComposite"/>
-        <service name="TargetService">
-            <interface.java interface="policy.Target"/>
-            <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/definitions.xml b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 3ae202f4aa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:binding.ws">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <!--  Policy Sets -->
-    <sca:policySet name="TestPolicySet_1_binding" 
-                   provides="ip:TestIntent_1" 
-                   appliesTo="sca:binding.ws"
-                   xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
deleted file mode 100644
index c6e46564f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ /dev/null
@@ -1,57 +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 bindingoverride;
-
-import junit.framework.Assert;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import policy.Target;
-
-public class BindingOverrideTestCase{
-
-    private SCADomain domain;
-    private Target targetClient;
-
-    @Before
-    public void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("bindingoverride/OuterComposite.composite");
-            targetClient = domain.getService(Target.class, "OuterClientComponent");
-        } catch(Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    //@Ignore("TUSCANY-2352")
-    public void test() throws Exception {
-        Assert.assertEquals("Target: Hello Target: Hello Fred!!", targetClient.hello("Fred"));
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index 3e71246da2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ /dev/null
@@ -1,74 +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 policy;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.impl.CompositeImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.annotations.EndsConversation;
-
-public class PolicyTestCase{
-
-    private SCADomain domain;
-    private Target targetClient;
-
-    @Before
-    public void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("policy/PolicyOuterComposite.composite");
-            targetClient = domain.getService(Target.class, "TargetClientComponent");
-        } catch(Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void test() throws Exception {
-    	//Check that the binding policy sets do flow down to the component but not down to the
-    	//component inside implementation.composite
-    	Component outerComponent = ((DefaultSCADomain)domain).getComponent("OuterTargetServiceComponent");
-    	
-    	// The outer component service bindings should have policy sets attached
-    	Assert.assertEquals(1, ((PolicySetAttachPoint)outerComponent.getServices().get(0).getBindings().get(0)).getPolicySets().size());
-    	
-    	Component component =((CompositeImpl)outerComponent.getImplementation()).getComponents().get(0);
-    	
-    	// The original inner component service binding should not have policy sets attached
-    	Assert.assertEquals(0, ((PolicySetAttachPoint)component.getServices().get(0).getBindings().get(0)).getPolicySets().size());
-        
-        // The promoted inner component service binding should have policy sets attached
-    	Assert.assertEquals(1, ((PolicySetAttachPoint)component.getServices().get(1).getBindings().get(0)).getPolicySets().size());
-    	
-        String result = targetClient.hello("Fred");
-
-        System.out.println(result);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
deleted file mode 100644
index 6638d65551..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ /dev/null
@@ -1,68 +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 recursive;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import recursive.Composer;
-
-/**
- * Test case for helloworld web service client 
- */
-public class ComposerClientTestCase {
-
-    private Composer composer;
-    private SCADomain scaDomain;
-    
-    private SCATestCaseRunner server;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("Client.composite");
-            composer = scaDomain.getService(Composer.class, "ClientComponent/Composer");
-    
-            server =  new SCATestCaseRunner(ComposerTestServer.class);
-            server.before();
-
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testWSClient() throws Exception {
-        String msg = composer.Compose("ABC");
-        Assert.assertEquals("Composed: ABC", msg);
-    }
-    
-    @After
-    public void stopClient() throws Exception {
-    	server.after();
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
deleted file mode 100644
index 214379bcea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ /dev/null
@@ -1,55 +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 recursive;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class ComposerTestServer {
-
-    private SCADomain scaDomain;
-
-    @Before
-    public void startServer() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("Outer.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testPing() throws IOException {
-        new Socket("127.0.0.1", 8085);
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/pom.xml b/tags/java/sca/1.3-RC1a/itest/recursive/pom.xml
deleted file mode 100644
index 472ea12c00..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-recursive</artifactId>
-    <name>Apache Tuscany SCA Recursive Composition Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/circular/include/DemoClass.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/circular/include/DemoClass.java
deleted file mode 100644
index fe42911486..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/circular/include/DemoClass.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 circular.include;
-
-public class DemoClass {
-
-    public String demo() {
-        return "hello";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/CompositeClient.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index 5edc305970..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/CompositeClient.java
+++ /dev/null
@@ -1,42 +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 composite;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeClient {
-
-    public static void main(String[] args) throws Exception {
-    	SCADomain domain = SCADomain.newInstance("OuterComposite.composite");
-    	
-        Source source = domain.getService(Source.class, "SourceComponent");
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        source.clientMethod("Client.main");
-        Thread.sleep(500);
-        
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/Source.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/Source.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 composite;
-
-public interface Source {
-
-    void clientMethod(String arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/SourceCallback.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/SourceCallback.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 composite;
-
-public interface SourceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/SourceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index b9a0c7ff74..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/SourceImpl.java
+++ /dev/null
@@ -1,55 +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 composite;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Source.class)
-@Scope("COMPOSITE")
-public class SourceImpl implements Source, SourceCallback {
-
-    private Target targetReference;
-    private Target targetReference2;
-
-    @Reference
-    public void setTargetReference(Target target) {
-        this.targetReference = target;
-    }
-
-    @Reference
-    public void setTargetReference2(Target target) {
-        this.targetReference2 = target;
-    }
-
-    public void clientMethod(String arg) {
-        System.out.println("Source: " + arg + " -> Source.clientMethod");
-        targetReference.someMethod(arg + " -> Source.clientMethod");
-
-        System.out.println("Source: " + arg + " => Source.clientMethod2");
-        targetReference2.someMethod(arg + " => Source.clientMethod2");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/Target.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/Target.java
deleted file mode 100644
index 9a8f68a7fa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/Target.java
+++ /dev/null
@@ -1,30 +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 composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/TargetImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index 86686e9233..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/composite/TargetImpl.java
+++ /dev/null
@@ -1,41 +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 composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Target.class)
-@Scope("COMPOSITE")
-public class TargetImpl implements Target {
-
-    private SourceCallback sourceCallback;
-
-    @Callback
-    public void setSourceCallback(SourceCallback sourceCallback) {
-        this.sourceCallback = sourceCallback;
-    }
-
-    public void someMethod(String arg) {
-        System.out.println("Target: " + arg);
-        sourceCallback.receiveResult(arg + " -> Target.someMethod");
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/A.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/A.java
deleted file mode 100644
index e87cbde26d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/A.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 foo;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(I.class)
-public class A implements I {
-    public String get(int i) {
-        return A.class.getName();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/B.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/B.java
deleted file mode 100644
index 9d060cab59..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/B.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 foo;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(I.class)
-public class B implements I {
-    protected I i = null;
-
-    @Reference(name = "i", required = true)
-    public void setC(I c) {
-        this.i = c;
-    }
-
-    public String get(int i) {
-        return this.i.get(i);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/I.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/I.java
deleted file mode 100644
index f6d55baef3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/foo/I.java
+++ /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.    
- */
-package foo;
-
-public interface I {
-    String get(int i);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/Target.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/Target.java
deleted file mode 100644
index c77fcea868..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/Target.java
+++ /dev/null
@@ -1,26 +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 policy;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/TargetClientImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index 87e412829e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ /dev/null
@@ -1,33 +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 policy;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetClientImpl implements Target {
-
-    @Reference
-    protected Target targetService;
-
-    public String hello(String arg) {
-        return "Target: Hello " + targetService.hello(arg) + "!";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index e565055252..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ /dev/null
@@ -1,29 +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 policy;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentAImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentAImpl.java
deleted file mode 100644
index f513949105..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ /dev/null
@@ -1,41 +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 sample;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentAImpl implements Service1 {
-
-    @Reference(name = "Reference1", required = false)
-    protected Service1 ref;
-
-    public String track(String source) {
-        if (ref != null) {
-            return ref.track(source + "-->ComponentA");
-        }
-        return source + "-->ComponentA";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentCImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentCImpl.java
deleted file mode 100644
index 586a9ee6a7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ /dev/null
@@ -1,41 +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 sample;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentCImpl implements Service1 {
-
-    @Reference(name = "Reference1", required = false)
-    protected Service1 ref;
-
-    public String track(String source) {
-        if (ref != null) {
-            return ref.track(source + "-->ComponentC");
-        }
-        return source + "-->ComponentC";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentEImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentEImpl.java
deleted file mode 100644
index dbf2735aa7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentEImpl.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 sample;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentEImpl implements Service1 {
-    @Property(name = "Property1")
-    protected String prefix;
-
-    @Reference(name = "Reference1")
-    protected Service1 ref;
-
-    public String track(String source) {
-        return ref.track(source + "-->ComponentE");
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentFImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentFImpl.java
deleted file mode 100644
index 5e136e536c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/ComponentFImpl.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 sample;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentFImpl implements Service1 {
-
-    private Service1 ref;
-
-    public String track(String source) {
-        if (ref != null) {
-            return ref.track(source + "-->ComponentF");
-        } else {
-            System.err.println("Reference1 is not wired...");
-            return source + "-->ComponentF";
-        }
-    }
-
-    @Reference(name = "Reference1")
-    public void setComponentA(Service1 ref) {
-        this.ref = ref;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/Service1.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/Service1.java
deleted file mode 100644
index 81bdce79f1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/sample/Service1.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 sample;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Service1 {
-    String track(String source);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/Aggregator.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/Aggregator.java
deleted file mode 100644
index 88b3bed1b2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/Aggregator.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 test;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Aggregator {
-    String getAggregatedData();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/AggregatorImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/AggregatorImpl.java
deleted file mode 100644
index f6ac6c8741..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ /dev/null
@@ -1,55 +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 test;
-
-import java.util.List;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Aggregator.class)
-public class AggregatorImpl implements Aggregator {
-
-    @Reference(name = "uniSource")
-    protected Source source;
-
-    @Reference(name = "multiSource")
-    protected List<Source> sources;
-
-    public String getAggregatedData() {
-        System.out.println("uniSource: " + source.getData());
-        StringBuffer sb = new StringBuffer();
-        int i = 0;
-        for (Source s : sources) {
-            if (i != 0) {
-                sb.append(", ");
-            } else {
-                sb.append("multiSource: ");
-            }
-            sb.append(s.getData());
-            i++;
-        }
-        return sb.toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/InnerSourceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/InnerSourceImpl.java
deleted file mode 100644
index c8dad5ae35..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ /dev/null
@@ -1,34 +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 test;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class InnerSourceImpl implements Source {
-
-    public String getData() {
-        return "InnerSource";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/OuterSourceImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/OuterSourceImpl.java
deleted file mode 100644
index 11816e82cf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ /dev/null
@@ -1,34 +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 test;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class OuterSourceImpl implements Source {
-
-    public String getData() {
-        return "OuterSource";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/Source.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/Source.java
deleted file mode 100644
index 9b93740d9d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test/Source.java
+++ /dev/null
@@ -1,30 +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 test;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Source {
-    String getData();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/Target.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/Target.java
deleted file mode 100644
index 4883e12f49..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/Target.java
+++ /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.    
- */
-package test1.composite;
-
-public interface Target {
-    String hello(String arg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/TargetOne.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/TargetOne.java
deleted file mode 100644
index a7c68f4ffd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ /dev/null
@@ -1,29 +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 test1.composite;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetOne implements Target {
-
-    public String hello(String arg) {
-        return "TargetOne: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/TargetTwo.java
deleted file mode 100644
index 7fff8e2e9b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ /dev/null
@@ -1,29 +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 test1.composite;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetTwo implements Target {
-
-    public String hello(String arg) {
-        return "TargetTwo: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/AComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/AComposite.composite
deleted file mode 100644
index 1b5dee8762..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/AComposite.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="AComposite">
-
-    <component name="AComponent">
-        <implementation.composite name="sample:BComposite"/>
-    </component>
-
-</composite>
-
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/BComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/BComposite.composite
deleted file mode 100644
index 7d4588eba4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/BComposite.composite
+++ /dev/null
@@ -1,45 +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://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="BComposite">
-
-    <service name="BService" promote="BComponent">
-        <interface.java interface="sample.C"/>
-    </service>
-
-    <component name="BComponent">
-        <implementation.composite name="sample:CComposite"/>
-
-        <reference name="PromotedRefX" target="XComponent"/>
-        <reference name="PromotedRefY" target="YComponent"/>
-    </component>
-
-    <component name="XComponent">
-		<implementation.java class="sample.XImpl"/>
-    </component>
-
-    <component name="YComponent">
-        <implementation.java class="sample.YImpl"/>
-    </component>
-
-</composite>
-
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/CComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/CComposite.composite
deleted file mode 100644
index 6d7b4ec600..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/CComposite.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="CComposite">
-
-    <service name="CService" promote="CComponent">
-        <interface.java interface="sample.C"/>
-    </service>
-
-    <reference name="PromotedRefX" promote="CComponent/refX">
-        <interface.java interface="sample.X"/>
-    </reference>
-
-    <reference name="PromotedRefY" promote="CComponent/refY">
-        <interface.java interface="sample.Y"/>
-    </reference>
-
-    <component name="CComponent">
-        <implementation.java class="sample.CImpl"/>
-        <reference name="refX"/>
-        <reference name="refY"/>
-    </component>
-
-</composite>
-
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite1.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite1.composite
deleted file mode 100644
index 56fd7c621f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite1.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="Composite1">
-
-    <component name="ComponentA">
-        <implementation.java class="sample.ComponentAImpl"/>
-    </component>
-
-    <component name="ComponentB">
-        <!-- Implemented by Composite3 -->
-        <implementation.composite name="sample:Composite3"/>
-        
-        <!-- Wired to ComponentA -->
-        <reference name="Reference1" target="ComponentA"/>
-
-        <property name="Property1">ABC</property>
-    </component>
-    
-    <!-- ComponentB.Service1 is promoted -->
-    <service name="Service1" promote="ComponentB/Service1" />
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite2.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite2.composite
deleted file mode 100644
index 54f10673a4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite2.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Composite2">
-
-    <component name="ComponentC">
-        <implementation.java class="sample.ComponentCImpl" />
-
-        <!-- Wired to ComponentD.Service1 -->
-        <reference name="Reference1" target="ComponentD/Service1" />
-    </component>
-
-    <component name="ComponentD">
-        <!-- Implemented by Composite3 -->
-        <implementation.composite name="sample:Composite3" />
-        
-        <!-- The property value is "XYZ" -->
-        <property name="Property1">XYZ</property>
-    </component>
-
-    <!-- ComponentD.Reference1 is promoted -->
-    <reference name="Reference1" promote="ComponentD/Reference1" />
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite3.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite3.composite
deleted file mode 100644
index 040653493f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Composite3.composite
+++ /dev/null
@@ -1,48 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="Composite3">
-
-    <component name="ComponentE">
-        <implementation.java class="sample.ComponentEImpl" />
-        <reference name="Reference1" target="ComponentF/Service1" />
-        
-        <!-- The property is from the composite Property1 -->
-        <property name="Property1" source="$Property1" />
-    </component>
-
-    <component name="ComponentF">
-        <implementation.java class="sample.ComponentFImpl" />
-    </component>
-
-    <service name="Service1" promote="ComponentE/Service1" />
-
-    <reference name="Reference1" promote="ComponentF/Reference1">
-    <!-- 
-        <binding.sca />
-     -->    
-    </reference>
-
-    <property name="Property1" type="xsd:string">123</property>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Demo1Composite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Demo1Composite.composite
deleted file mode 100644
index 6b2a964b9b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Demo1Composite.composite
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://sample" xmlns:sample="http://sample" name="Demo1Composite"

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

-    <include name="sample:Demo2Composite" />

-    <component name="Demo1Component">

-        <implementation.java class="circular.include.DemoClass" />

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Demo2Composite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Demo2Composite.composite
deleted file mode 100644
index 6b8c0a348e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Demo2Composite.composite
+++ /dev/null
@@ -1,28 +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://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://sample" xmlns:sample="http://sample" name="Demo2Composite"

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

-    <include name="sample:Demo1Composite" />

-    <component name="Demo2Component">

-        <implementation.java class="circular.include.DemoClass" />

-    </component>

-</composite>

-

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Inner.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Inner.composite
deleted file mode 100644
index 398ebdf6e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,45 +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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://test"

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

-    name="Inner">

-

-    <component name="Aggregator">

-        <implementation.java class="test.AggregatorImpl"/>

-        <reference name="uniSource" target="InnerSource/Source"/>

-        <reference name="multiSource" target="InnerSource/Source"/>

-    </component>

-

-    <component name="InnerSource">

-        <implementation.java class="test.InnerSourceImpl"/>

-    </component>

-    

-    <reference name="uniSource" promote="Aggregator/uniSource">

-        <binding.sca/>

-    </reference>

-

-    <reference name="multiSource" promote="Aggregator/multiSource">

-        <binding.sca/>

-    </reference>

-    

-    <service name="aggregator" promote="Aggregator"/>

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/InnerComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/InnerComposite.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="InnerComposite">
-
-    <service name="InnerSourceService" promote="InnerSourceComponent">
-        <interface.java interface="composite.Source"/>
-    </service>
-       
-    <component name="InnerSourceComponent">
-		<implementation.java class="composite.SourceImpl"/>
-    </component>
-	    
-    <reference name="targetComponentRef" promote="InnerSourceComponent/targetReference">
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </reference>
-    
-    <reference name="targetComponentRef2" promote="InnerSourceComponent/targetReference2">
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/InnerComposite2.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/InnerComposite2.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="InnerComposite2">
-
-    <service name="InnerTargetService" promote="InnerTargetComponent"> 
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </service>
-       
-    <component name="InnerTargetComponent">
-		<implementation.java class="composite.TargetImpl"/>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 289b92a3f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

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

-   <deployable composite="sample:OuterComposite"/>

-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Outer.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Outer.composite
deleted file mode 100644
index 987990d854..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/Outer.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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://test"

-    xmlns:test="http://test"

-    name="Outer">

-

-    <component name="OuterSource">

-        <implementation.java class="test.OuterSourceImpl"/>

-    </component>

-

-    <component name="Inner">

-        <!-- Implemented by Composite3 -->

-        <implementation.composite name="test:Inner"/>

-        

-        <reference name="uniSource" target="OuterSource"/>

-        

-        <reference name="multiSource" target="OuterSource"/>

-

-    </component>

-    

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/OuterComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/OuterComposite.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://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample"
-    xmlns:sample="http://sample"
-    name="OuterComposite">
-
-    <component name="SourceComponent">
-        <implementation.composite name="sample:InnerComposite"/>
-        <reference name="targetComponentRef" target="TargetComponent"/>
-        <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/>
-    </component>
-
-    <component name="TargetComponent">
-		<implementation.java class="composite.TargetImpl"/>
-    </component>
-    
-    <component name="TargetComponent2">
-        <implementation.composite name="sample:InnerComposite2"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/foo.png b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/foo.png
deleted file mode 100644
index 0f2ec78aaf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/foo.png
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o1.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o1.composite
deleted file mode 100644
index 1d31c2f424..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o1.composite
+++ /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.    

--->

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

-    name="O1Composite">

-

-    <service name="O1Service" promote="AComponent">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="AComponent">

-        <implementation.java class="foo.A" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o2.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o2.composite
deleted file mode 100644
index 4f21c21860..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o2.composite
+++ /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.    

--->

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

-    name="O2Composite">

-

-    <service name="O2Service" promote="O1Component/O1Service">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="O1Component">

-        <implementation.composite name="bar:O1Composite" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o3.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o3.composite
deleted file mode 100644
index 72c732c03e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o3.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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://bar" xmlns:bar="http://bar"

-    name="O3Composite">

-

-    <service name="O3Service" promote="BComponent">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="BComponent">

-        <implementation.java class="foo.B" />

-    </component>

-

-    <reference name="O3Reference" promote="BComponent/i">

-        <interface.java interface="foo.I" />

-    </reference>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o4.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o4.composite
deleted file mode 100644
index f8f07eed09..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/foo/o4.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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://bar" xmlns:bar="http://bar"

-    name="O4Composite">

-

-    <service name="O4Service" promote="O3Component/O3Service">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="O3Component">

-        <implementation.composite name="bar:O3Composite" />

-        <reference name="O3Reference" target="O2Component/O2Service" />

-    </component>

-

-    <component name="O2Component">

-        <implementation.composite name="bar:O2Composite" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4a6df023b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/PolicyInnerComposite.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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://policy"

-    xmlns:policy="http://policy"

-    name="PolicyInnerComposite">

-

-   	<service name="TargetService" promote="TargetServiceComponent"> 

-    </service>

-	

-    <component name="TargetServiceComponent">

-		<implementation.java class="policy.TargetServiceImpl"/> 

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index 25007aebb2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/PolicyOuterComposite.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://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://policy"
-    xmlns:policy="http://policy"
-    requires="policy:TestIntent_1"
-    name="PolicyOuterComposite">
-    
-    <component name="TargetClientComponent">
-        <implementation.java class="policy.TargetClientImpl"/>
-        <reference name="targetService" target="OuterTargetServiceComponent"/>
-    </component>
-    
-    <component name="OuterTargetServiceComponent">
-        <implementation.composite name="policy:PolicyInnerComposite"/>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/definitions.xml b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 957028e3bd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/policy/definitions.xml
+++ /dev/null
@@ -1,46 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:implementation">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <!--  Policy Sets -->
-    <sca:policySet name="TestPolicySet_1_composite" 
-                   provides="ip:TestIntent_1" 
-                   appliesTo="sca:implementation.composite"
-                   xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-    
-    <sca:policySet name="TestPolicySet_1_java" 
-                   provides="ip:TestIntent_1" 
-                   appliesTo="sca:implementation.java"
-                   xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/test1/InnerComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/test1/InnerComposite.composite
deleted file mode 100644
index 177fa10550..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/test1/InnerComposite.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://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://sample1"
-    xmlns:sample1="http://sample1"
-    name="InnerComposite">
-
-   	<service name="Service_One" promote="ComponentOne"> 
-        <interface.java interface="test1.composite.Target"/>
-    </service>
-    <service name="Service_Two" promote="ComponentTwo"> 
-        <interface.java interface="test1.composite.Target"/>
-    </service>
-	
-    <component name="ComponentOne">
-		<implementation.java class="test1.composite.TargetOne"/>
-    </component>
-	<component name="ComponentTwo">
-		<implementation.java class="test1.composite.TargetTwo"/>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/test1/OuterComposite.composite b/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/test1/OuterComposite.composite
deleted file mode 100644
index d05a67f45f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://sample1"

-    xmlns:sample1="http://sample1"

-    name="OuterComposite">

-    <component name="Test1TargetComponent">

-        <implementation.composite name="sample1:InnerComposite"/>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
deleted file mode 100644
index 1f7c35dd91..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.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 circular.include;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.Test;
-
-public class CircularIncludeTestCase {
-
-    @Test
-    public void testCyclicInclude() {
-        SCADomain scaDomain = SCADomain.newInstance("Demo1Composite.composite");
-
-        DemoClass demoService = scaDomain.getService(DemoClass.class, "Demo1Component");
-        String demo = demoService.demo();
-        Assert.assertEquals("hello", demo);
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/CompositeTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 5482e47463..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ /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.    
- */
-package composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CompositeTestCase extends TestCase {
-
-    private SCADomain domain;
-    private Source source;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("OuterComposite.composite");
-        source = domain.getService(Source.class, "SourceComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            System.out.println("Main thread " + Thread.currentThread());
-            source.clientMethod("Client.main");
-            System.out.println("Sleeping ...");
-            Thread.sleep(1000);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
deleted file mode 100644
index f042113f7a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ /dev/null
@@ -1,113 +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 composite;

-

-import java.io.File;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

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

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-public class LocateServiceEmbeddedSCADomainTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution contribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        // Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        File contribLocation = new File("./target/classes/");

-        URL contributionURL = contribLocation.toURL();

-        contribution = contributionService.contribute("http://contribution", contributionURL, false);

-        for (Composite deployable : contribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : contribution.getDeployables() ) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-

-    public void testValidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-    public void testInvalidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponentXXX");

-            // The source proxy can be created for the remote target but it will throw exception when a method is invoked

-            source.clientMethod("ABC");

-            fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");

-        } catch (org.osoa.sca.ServiceRuntimeException e) {

-            // expected.

-        }

-    }

-    

-    public void testValidRecursiveLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent/InnerSourceService");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://contribution");

-

-        // Stop Components from my composite

-        for (Composite deployable : contribution.getDeployables() ) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
deleted file mode 100644
index 87eb948452..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ /dev/null
@@ -1,73 +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 composite;

-

-import junit.framework.TestCase;

-

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

-

-public class LocateServiceSCADomainTestCase extends TestCase {

-

-    private SCADomain domain;

-    

-

-    @Override

-    protected void setUp() throws Exception {

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

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-

-    public void testValidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-    public void testInvalidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponentXXX");

-            // The source proxy can be created for the remote target but it will throw exception when a method is invoked

-            source.clientMethod("ABC");

-            fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");

-        } catch (org.osoa.sca.ServiceRuntimeException e) {

-            // expected.

-        }

-    }

-    

-    public void testValidRecursiveLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent/InnerSourceService");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/foo/O2TestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/foo/O2TestCase.java
deleted file mode 100644
index d617ec8592..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/foo/O2TestCase.java
+++ /dev/null
@@ -1,32 +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 foo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class O2TestCase extends TestCase {
-
-    public void testGet() throws Exception {
-        SCADomain sca = SCADomain.newInstance("foo/o2.composite");
-        I i = sca.getService(I.class, "O1Component");
-        assertEquals("foo.A", i.get(0));
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/foo/O4TestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/foo/O4TestCase.java
deleted file mode 100644
index 15626c75ac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/foo/O4TestCase.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 foo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class O4TestCase extends TestCase {
-
-	public void testO3Component() throws Exception {
-		SCADomain sca = SCADomain.newInstance("foo/o4.composite");
-		I i = sca.getService(I.class, "O3Component");
-		assertEquals("foo.A", i.get(0));
-	}
-
-	public void testO2Component() throws Exception {
-		SCADomain sca = SCADomain.newInstance("foo/o4.composite");
-		I i = sca.getService(I.class, "O2Component");
-		assertEquals("foo.A", i.get(0));
-	}
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/policy/PolicyTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index c9cc84f7d4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/policy/PolicyTestCase.java
+++ /dev/null
@@ -1,68 +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 policy;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.impl.CompositeImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PolicyTestCase {
-
-    private SCADomain domain;
-    private Target targetClient;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("policy/PolicyOuterComposite.composite");
-        targetClient = domain.getService(Target.class, "TargetClientComponent");
-    }
-   
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void test() throws Exception {
-        try {
-        	//Check that the implementation policy sets don't flow down to the components
-        	//implementations that are themselves composites (implementation.composite)
-        	Component outerComponent = ((DefaultSCADomain)domain).getComponent("OuterTargetServiceComponent");
-        	
-        	Assert.assertEquals(0, outerComponent.getPolicySets().size());
-        	
-        	for (Component component :((CompositeImpl)outerComponent.getImplementation()).getComponents()){
-        		Assert.assertEquals(0, component.getPolicySets().size());
-        	}
-        	
-        	// debugging
-            String result = targetClient.hello("Fred");
-
-            System.out.println(result);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/C.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/C.java
deleted file mode 100644
index bf8391348b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/C.java
+++ /dev/null
@@ -1,32 +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 sample;
-
-/**
- * Simple Service
- */
-public interface C {
-
-    /**
-     * Sample operation
-     * 
-     * @return A String
-     */
-    String cOp();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/CImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/CImpl.java
deleted file mode 100644
index 466284983e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/CImpl.java
+++ /dev/null
@@ -1,80 +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 sample;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implementation of a simple service
- */
-@Service(C.class)
-public class CImpl implements C {
-
-    /**
-     * Reference to X
-     */
-    private X xRef;
-    
-    /**
-     * Reference to Y
-     */
-    private Y yRef;
-
-    /**
-     * Setter for refX
-     * 
-     * @param x Reference to X
-     */
-    @Reference(name="refX")
-    protected void setX(X x)
-    {
-        System.out.println("Setting X on CImpl to " + x);
-        xRef = x;
-    }
-    
-    /**
-     * Setter for refY
-     * 
-     * @param y Reference to Y
-     */
-    @Reference(name="refY")
-    protected void setY(Y y)
-    {
-        System.out.println("Setting Y on CImpl to " + y);
-        yRef = y;
-    }
-    
-    /**
-     * Simple operation that uses the injected references to X and Y
-     * 
-     * @return "C:cOp() - xResult = " + xRef.xOP() + " yResult = " + yRef.yOp();
-     */
-    public String cOp() {
-        Assert.assertNotNull(xRef);
-        Assert.assertNotNull(yRef);
-        
-        String xResult = xRef.xOp();
-        String yResult = yRef.yOp();
-        
-        return "C:cOp() - xResult = " + xResult + " yResult = " + yResult;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/NestedTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/NestedTestCase.java
deleted file mode 100644
index fc5d251460..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ /dev/null
@@ -1,96 +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 sample;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-/**
- * Test for implementation.composite using implementation.composite
- */
-public class NestedTestCase extends TestCase {
-
-    /**
-     * Reference to the domain
-     */
-    private SCADomain domain; 
-
-    /**
-     * Tear down the domain
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * This tests having:
-     * 
-     *   AComponent -> implementation.composite(BComposite)
-     *   BComposite -> implementation.composite(CComposite)
-     *   
-     * This test fails.
-     * 
-     * @throws Exception Failed
-     */
-    public void testAComponent() throws Exception {
-        domain = SCADomain.newInstance("AComposite.composite");
-        
-        System.out.println("Deployed names = " + domain.getComponentManager().getComponentNames());
-        
-        C c = domain.getService(C.class, "AComponent");
-
-        String result = c.cOp();
-        System.out.println("Method call returned [" + result + "]");
-        Assert.assertNotNull(result);
-        Assert.assertTrue(result.indexOf("C:cOp()") != -1);
-        Assert.assertTrue(result.indexOf("X:xOp()") != -1);
-        Assert.assertTrue(result.indexOf("Y:yOp()") != -1);
-    }
-
-
-    /**
-     * This tests having:
-     * 
-     *   BComposite -> implementation.composite(CComposite)
-     * 
-     * This test works.
-     * 
-     * @throws Exception Failed
-     */
-    public void testBComponent() throws Exception {
-        domain = SCADomain.newInstance("BComposite.composite");
-        
-        System.out.println("Deployed names = " + domain.getComponentManager().getComponentNames());
-          
-        C c = domain.getService(C.class, "BComponent");
-        
-        String result = c.cOp();
-        System.out.println("Method call returned [" + result + "]");
-        Assert.assertNotNull(result);
-        Assert.assertTrue(result.indexOf("C:cOp()") != -1);
-        Assert.assertTrue(result.indexOf("X:xOp()") != -1);
-        Assert.assertTrue(result.indexOf("Y:yOp()") != -1);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
deleted file mode 100644
index a543add69b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ /dev/null
@@ -1,53 +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 sample;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class RecursiveCompositeTestCaseFIXME extends TestCase {
-
-    private SCADomain domain;
-    private Service1 tracker, tracker2;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("http://localhost", "/", "Composite1.composite", "Composite2.composite");
-        tracker = domain.getService(Service1.class, "ComponentC");
-        tracker2 = domain.getService(Service1.class, "ComponentB");
-
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            System.out.println("Main thread " + Thread.currentThread());
-            System.out.println(tracker.track("Client"));
-            System.out.println(tracker2.track("Client"));
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/X.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/X.java
deleted file mode 100644
index e3a9335068..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/X.java
+++ /dev/null
@@ -1,32 +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 sample;
-
-/**
- * Simple Service
- */
-public interface X {
-
-    /**
-     * Simple Operation
-     * 
-     * @return A String
-     */
-    String xOp();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/XImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/XImpl.java
deleted file mode 100644
index e430807568..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/XImpl.java
+++ /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.    
- */
-package sample;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implementation of a simple service
- */
-@Service(X.class)
-public class XImpl implements X {
-
-    /**
-     * Simple operation
-     * 
-     * @return "X:xOp()"
-     */
-    public String xOp() {
-        return "X:xOp()";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/Y.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/Y.java
deleted file mode 100644
index c15a4f635a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/Y.java
+++ /dev/null
@@ -1,32 +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 sample;
-
-/**
- * Simple Service
- */
-public interface Y {
-
-    /**
-     * Simple Operation
-     * 
-     * @return A String
-     */
-    String yOp();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/YImpl.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/YImpl.java
deleted file mode 100644
index 994c9eb95f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/sample/YImpl.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 sample;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implementation of a Simple Service
- */
-@Service(Y.class)
-public class YImpl implements Y {
-
-    /**
-     * A simple operation
-     * 
-     * @return "Y:yOp()"
-     */
-    public String yOp() {
-        return "Y:yOp()";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test/InnerTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test/InnerTestCase.java
deleted file mode 100644
index ebb4bc7acb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test/InnerTestCase.java
+++ /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.    
- */
-package test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class InnerTestCase extends TestCase {
-
-    private SCADomain domain;
-    private Aggregator aggregator;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("Inner.composite");
-        aggregator = domain.getService(Aggregator.class, "Aggregator");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            String result = aggregator.getAggregatedData();
-            assertTrue(result.contains("InnerSource"));
-            assertTrue(result.contains("InnerSource"));
-            System.out.println(result);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test/OuterTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test/OuterTestCase.java
deleted file mode 100644
index 17de5ca4a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test/OuterTestCase.java
+++ /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.    
- */
-package test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class OuterTestCase extends TestCase {
-
-    private SCADomain domain;
-    private Aggregator aggregator;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("Outer.composite");
-        aggregator = domain.getService(Aggregator.class, "Inner");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            String result = aggregator.getAggregatedData();
-            assertTrue(result.contains("InnerSource"));
-            assertTrue(result.contains("OuterSource"));
-            System.out.println(result);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
deleted file mode 100644
index b3abcac06e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ /dev/null
@@ -1,62 +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 test1.composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- */
-public class CompositeClientTestCase extends TestCase {
-    
-    private SCADomain scaDomain;
-    private Target target;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("test1/OuterComposite.composite");
-        target = scaDomain.getService(Target.class, "Test1TargetComponent/Service_Two");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }    
-
-    public void testComposite() throws Exception {
-        String res = target.hello("Wang Feng");
-        assertEquals("TargetTwo: Hello Wang Feng!", res);
-    }
-    
-    // Test for problem in TUSCANY-2010
-    public void testURLs() throws Exception {
-        try {
-            System.out.println("Component URI: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getURI());
-            System.out.println("  Service Name: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getName());
-            System.out.println("    Binding Name: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getBindings().get(0).getName());
-            System.out.println("    Binding URI: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getBindings().get(0).getURI());
-            assertEquals("/Test1TargetComponent/Service_One", scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getBindings().get(0).getURI());
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/pom.xml b/tags/java/sca/1.3-RC1a/itest/references/pom.xml
deleted file mode 100644
index 4a8584e61d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-references</artifactId>
-    <name>Apache Tuscany SCA References Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
deleted file mode 100644
index f8c0850118..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ /dev/null
@@ -1,40 +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.itest.references;
-
-public interface AComponent {
-
-    String fooB();
-
-    String fooC();
-
-    String fooBC();
-
-    String fooD1();
-
-    String fooD2();
-
-    String fooMultipleD();
-
-    String fooMultipleDArray();
-
-    String fooMultipleDServiceRef();
-
-    DComponent getDReference();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
deleted file mode 100644
index 647fff0159..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ /dev/null
@@ -1,126 +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.itest.references;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-
-public class AComponentImpl implements AComponent {
-
-    @Reference(name = "bReference")
-    protected BComponent b;
-
-    @Reference
-    protected CComponent cReference;
-
-    @Reference(required = false)
-    protected DComponent dReference;
-
-    @Reference(name = "dReferences")
-    public Collection<DComponent> dReferences;
-    
-    @Reference(name = "dReferenceArray")
-    public DComponent[] dReferenceArray;
-
-
-    @Reference(name = "dServiceReferences")
-    public List<ServiceReference<DComponent>> dServiceReferences;
-
-    private DComponent dReference1;
-
-    private DComponent dReference2;
-
-    @Reference(name = "dReference1")
-    public void setDReference(DComponent dReference) {
-        this.dReference1 = dReference;
-    }
-
-    @Reference
-    public void setDReference2(DComponent dReference2) {
-        this.dReference2 = dReference2;
-    }
-
-    public String fooB() {
-        return b.bFoo();
-    }
-
-    public String fooC() {
-        return cReference.cFoo();
-    }
-
-    public String fooBC() {
-        return b.fooC();
-    }
-
-    public String fooD() {
-        return dReference1.dFoo();
-    }
-
-    public String fooD1() {
-        return dReference1.dFoo();
-    }
-
-    public String fooD2() {
-        return dReference2.dFoo();
-    }
-
-    public String fooMultipleDArray() {
-        StringBuffer str = new StringBuffer();
-        for (DComponent d : dReferenceArray) {
-            str.append(d.getComponentName());
-            str.append(',');
-        }
-        if (str.length() > 0) {
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }    
-    
-    public String fooMultipleD() {
-        StringBuffer str = new StringBuffer();
-        for (DComponent d : dReferences) {
-            str.append(d.getComponentName());
-            str.append(',');
-        }
-        if (str.length() > 0) {
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }
-    
-    public String fooMultipleDServiceRef() {
-        StringBuffer str = new StringBuffer();
-        for (ServiceReference<DComponent> d : dServiceReferences) {
-            str.append(d.getService().getComponentName());
-            str.append(',');
-        }
-        if (str.length() > 0) {
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }
-
-    public DComponent getDReference() {
-        return dReference;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
deleted file mode 100644
index 785920bb2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ /dev/null
@@ -1,26 +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.itest.references;
-
-public interface BComponent {
-
-    String bFoo();
-
-    String fooC();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
deleted file mode 100644
index 6b1065ab0d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.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 org.apache.tuscany.sca.itest.references;
-
-import org.osoa.sca.annotations.Reference;
-
-public class BComponentImpl implements BComponent {
-
-    protected CComponent cReference;
-
-    public BComponentImpl(@Reference(name = "cReference") CComponent cReference) {
-        this.cReference = cReference;
-    }
-
-    public String bFoo() {
-        return "BComponent";
-    }
-
-    public String fooC() {
-        return "B" + cReference.cFoo();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
deleted file mode 100644
index d436c28adc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.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 org.apache.tuscany.sca.itest.references;
-
-public interface CComponent {
-
-    String cFoo();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
deleted file mode 100644
index a1823e1cdc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.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 org.apache.tuscany.sca.itest.references;
-
-public class CComponentImpl implements CComponent {
-
-    public String cFoo() {
-        return "CComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
deleted file mode 100644
index 2618ec7095..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.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 org.apache.tuscany.sca.itest.references;
-
-import org.osoa.sca.annotations.Remotable;
-
-public interface DComponent {
-
-    String dFoo();
-    String getComponentName();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
deleted file mode 100644
index 79c802bc97..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.references;
-
-import org.osoa.sca.annotations.ComponentName;
-
-public class DComponentImpl implements DComponent {
-    @ComponentName
-    public String name;
-
-    public String dFoo() {
-        return "DComponent";
-    }
-
-    public String getComponentName() {
-        return name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/AutoWiredReferencesTest.composite
deleted file mode 100644
index 9f88f05abe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ /dev/null
@@ -1,56 +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

-    * 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:foo="http://foo" targetNamespace="http://foo"

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

-

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />

-    </service>

-

-    <component name="AComponent" autowire="false">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

-        <reference name="bReference" target="BComponent" />

-        <reference name="cReference" autowire="true" />

-        <reference name="dReference1" />

-        <!-- 

-            <reference name="dReference1" target="DComponent" />

-        -->

-        <reference name="DReference2" target="DComponent" />

-        <reference name="dReferences" autowire="true" />

-        <reference name="dReferenceArray" autowire="true" />

-        <reference name="dServiceReferences" target="DComponent DComponent1" />

-

-    </component>

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" />

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" />

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-

-    <component name="DComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/InnerReferencesTest.composite b/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/InnerReferencesTest.composite
deleted file mode 100644
index 6cadc52c13..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/InnerReferencesTest.composite
+++ /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

-    * 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:foo="http://foo" targetNamespace="http://foo"

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

-

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />

-    </service>

-

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

-        <reference name="bReference" target="BComponent" />

-        <reference name="cReference" target="CComponent" />

-        <reference name="dReference1" target="DComponent" />

-        <reference name="DReference2" target="DComponent" />

-        <reference name="dReferences" target="DComponent DComponent1" />

-        <reference name="dReferenceArray" target="DComponent1" />

-        <reference name="dServiceReferences" target="DComponent DComponent1" />

-    </component>

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" />

-        <reference name="cReference" target="CComponent" />

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" />

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-    

-    <component name="DComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-        

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/ManualWiredReferencesTest.composite
deleted file mode 100644
index 3b546a34e0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ /dev/null
@@ -1,63 +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
-    * 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:foo="http://foo" targetNamespace="http://foo"
-    name="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
-
-    <service name="AComponent" promote="AComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />
-    </service>
-
-    <component name="AComponent" >
-        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />
-        <reference name="bReference" target="BComponent" />
-        <reference name="cReference" target="CComponent/CComponent">
-            <binding.sca uri="DComponent"/>
-        </reference>
-        <reference name="dReference1" >
-            <binding.sca uri="DComponent"/>
-        </reference>
-        <reference name="DReference2" target="DComponent" >
-            <!-- binding.ws uri="DComponent"/-->
-        </reference>
-        <reference name="dReferences" target="DComponent DComponent1" />
-        <reference name="dReferenceArray" target="DComponent DComponent1" />
-        <reference name="dServiceReferences" target="DComponent DComponent1" />
-
-    </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" />
-    </component>
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" />
-    </component>
-
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />
-        <service name="DComponentImpl">
-            <binding.sca/>
-            <!-- binding.ws/-->
-        </service>
-    </component>
-
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />
-    </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
deleted file mode 100644
index b803f4bfa4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ /dev/null
@@ -1,91 +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.itest.references;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AutoWiredReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("AutoWiredReferencesTest.composite");
-        acomponent = domain.getService(AComponent.class, "AComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testBReference() {
-        assertEquals("BComponent", acomponent.fooB());
-    }
-
-    @Test
-    public void testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testD1Reference() {
-        acomponent.fooD1();
-    }
-
-    @Test
-    public void testD2Reference() {
-        assertEquals("DComponent", acomponent.fooD2());
-    }
-    
-    @Test
-    public void testMultiDReferenceArray() {
-        String components = acomponent.fooMultipleDArray();
-        Assert.assertTrue(components.contains("DComponent1"));
-    }    
-    
-    @Test
-    public void testMultiDServiceReference() {
-        String components = acomponent.fooMultipleDServiceRef();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }        
-
-    @Test
-    public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().dFoo();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
deleted file mode 100644
index 1d8284f0fd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ /dev/null
@@ -1,94 +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.itest.references;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class InnerReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("InnerReferencesTest.composite");
-        acomponent = domain.getService(AComponent.class, "AComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testBReference() {
-        assertEquals("BComponent", acomponent.fooB());
-    }
-
-    @Test
-    public void testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test
-    public void testD1Reference() {
-        assertEquals("DComponent", acomponent.fooD1());
-    }
-
-    @Test
-    public void testD2Reference() {
-        assertEquals("DComponent", acomponent.fooD2());
-    }
-    
-    @Test
-    public void testMultiDReference() {
-        String components = acomponent.fooMultipleD();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }
-    
-    @Test
-    public void testMultiDReferenceArray() {
-        String components = acomponent.fooMultipleDArray();
-        Assert.assertTrue(components.equals("DComponent1"));
-    }    
-    
-    @Test
-    public void testMultiDServiceReference() {
-        String components = acomponent.fooMultipleDServiceRef();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }    
-
-    @Test(expected = NullPointerException.class)
-    public void testRequiredFalseReference() {
-        acomponent.getDReference().dFoo();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
deleted file mode 100644
index 4b3a745a19..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ /dev/null
@@ -1,93 +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.itest.references;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class ManualWiredReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("ManualWiredReferencesTest.composite");
-        acomponent = domain.getService(AComponent.class, "AComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testBReference() {
-        assertEquals("BComponent", acomponent.fooB());
-    }
-
-    @Test
-    public void testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test
-    public void testD1Reference() {
-        acomponent.fooD1();
-    }
-
-    @Ignore
-    @Test
-    public void testD2Reference() {
-        assertEquals("DComponent", acomponent.fooD2());
-    }
-    
-    @Test
-    public void testMultiDReferenceArray() {
-        String components = acomponent.fooMultipleDArray();
-        Assert.assertTrue(components.contains("DComponent1"));
-    }    
-    
-    @Test
-    public void testMultiDServiceReference() {
-        String components = acomponent.fooMultipleDServiceRef();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }        
-
-    @Test
-    public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().dFoo();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/scopes/pom.xml b/tags/java/sca/1.3-RC1a/itest/scopes/pom.xml
deleted file mode 100644
index 65750a511a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/scopes/pom.xml
+++ /dev/null
@@ -1,47 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <name>Apache Tuscany SCA Scopes Integration Tests</name>
-    <artifactId>itest-scopes</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
deleted file mode 100644
index 4aa414be8e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ /dev/null
@@ -1,46 +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.itest.scopes;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * Test Composite scope
- */
-@Scope("COMPOSITE")
-public class CompositeScopeStateVerifierImpl implements StateVerifier {
-
-    // State data for this module (composite).
-    // In order to support thread-based state verification,
-    // the module state needs to be a ThreadLocal.
-    ThreadLocal<Integer> moduleState;
-
-    public CompositeScopeStateVerifierImpl() {
-      moduleState = new ThreadLocal<Integer>();
-    }
-
-    public void setState(int i) {
-      moduleState.set(i);
-    }
-
-    public boolean checkState(int i) {
-      return (moduleState.get() == i);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
deleted file mode 100644
index fae4dcd586..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ /dev/null
@@ -1,50 +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.itest.scopes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * Test request scope
- */
-@Scope("REQUEST")
-public class RequestScopeStateVerifierImpl implements StateVerifier {
-    // State data for this request thread.
-    int requestState;
-
-    public void setState(int i) {
-      requestState = i;
-    }
-
-    public boolean checkState(int i) {
-      return (requestState == i);
-    }
-    
-    @Init
-    public void init() {
-        requestState = 0;
-    }
-    
-    @Destroy
-    public void destroy() {
-        requestState = -1; 
-    }
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
deleted file mode 100644
index 878f7e4cc6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.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 org.apache.tuscany.sca.itest.scopes;
-
-public interface StateVerifier {
-    void setState(int i);
-    boolean checkState(int i);
-}
-
diff --git a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/resources/scopes.composite b/tags/java/sca/1.3-RC1a/itest/scopes/src/main/resources/scopes.composite
deleted file mode 100644
index 54a1b66830..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/scopes/src/main/resources/scopes.composite
+++ /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.

--->

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

-       name="Scopes">

-

-    <!-- Components used to test scopes. -->

-

- 	<component name="RequestScopeComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.scopes.RequestScopeStateVerifierImpl"/>

-    </component>

-

- 	<component name="ModuleScopeComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.scopes.CompositeScopeStateVerifierImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/tags/java/sca/1.3-RC1a/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
deleted file mode 100644
index ce2519cbc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ /dev/null
@@ -1,93 +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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.scopes.StateVerifier;
-
-public class ScopeTestCase extends TestCase {
-
-    final static int numThreads = 4; // number of threads to drive each scope container
-    final static int iterations = 200; // number of iterations per thread
-    private SCADomain domain;
-
-    // Test scope containers.
-    // The request scope container isn't hooked up for some reason so the code below
-    // that tests request scope is commented out.
-    // Code could be added to test session scope once it is supported in a standalone environment.
-
-    public void testScopes() throws InterruptedException {
-
-      Thread[] moduleScopeThreadTable = new Thread[numThreads];
-      Thread[] requestScopeThreadTable = new Thread[numThreads];
-
-      for(int i=0; i<numThreads; i++)
-      {
-        moduleScopeThreadTable[i] = new ModuleScopeTestThread();
-        requestScopeThreadTable[i] = new RequestScopeTestThread();
-      }
-      for(int j=0; j<numThreads; j++)
-      {
-        moduleScopeThreadTable[j].start();
-        requestScopeThreadTable[j].start();
-      }
-      for(int k=0; k<numThreads; k++)
-      {
-        moduleScopeThreadTable[k].join();
-        requestScopeThreadTable[k].join();
-      }
-    }
-
-    private  class ModuleScopeTestThread extends Thread {
-      @Override
-    public void run() {
-        StateVerifier moduleScopeService = domain.getService(StateVerifier.class, "ModuleScopeComponent");
-        for(int i=1; i<=iterations; i++) {
-          moduleScopeService.setState(i);
-          if (!moduleScopeService.checkState(i))
-            fail("The module scope service lost its state on iteration " + i);
-        }
-      }
-    }
-
-    private class RequestScopeTestThread extends Thread {
-      @Override
-    public void run() {
-        StateVerifier requestScopeService = domain.getService(StateVerifier.class, "RequestScopeComponent");
-        for(int i=1; i<=iterations; i++) {
-          requestScopeService.setState(i);
-          if (!requestScopeService.checkState(i))
-            fail("The request scope service lost its state on iteration " + i);
-        }
-      }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("scopes.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/pom.xml b/tags/java/sca/1.3-RC1a/itest/serialization/pom.xml
deleted file mode 100644
index 325ca725d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/pom.xml
+++ /dev/null
@@ -1,66 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-serialization</artifactId>
-    <name>Apache Tuscany SCA Serialization Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>       
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>  
-           
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
deleted file mode 100644
index fa0f1c88d6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
+++ /dev/null
@@ -1,81 +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.itest.servicereference;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * A very simple Conversational Service
- *
- * @version $Date$ $Revision$
- */
-@Conversational
-@Callback(ConversationalServiceCallback.class)
-public interface ConversationalService {
-
-    /**
-     * Default value for the user data
-     * 
-     * @See {@link #getUserData()}
-     * @See {@link #setUserData(String)}
-     */
-    String DEFAULT_USER_DATA = "NOT SET";
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    Object getConversationID();
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    ServiceReference<ConversationalService> createSelfRef();
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    void setUserData(String a_Data);
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    String getUserData();
-
-    /**
-     * Method that triggers the callback.
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    void triggerCallback(String msg) throws Exception;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
deleted file mode 100644
index 85d5dd860c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
+++ /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.    
- */
-package org.apache.tuscany.sca.itest.servicereference;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * This is the callback for the ConversationalService.
- *
- * @version $Rev$ $Date$
- */
-@Conversational
-public interface ConversationalServiceCallback {
-
-    /**
-     * Simple callback method.
-     * 
-     * @param msg The message for the call back
-     */
-    void callback(String msg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
deleted file mode 100644
index 50c98d1afc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
+++ /dev/null
@@ -1,141 +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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service implementation
- * 
- * @version $Date$ $Revision$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-public class ConversationalServiceImpl implements ConversationalService {
-
-    /**
-     * The Conversation ID
-     */
-    private Object m_ConversationID;
-
-    /**
-     * Injected reference to the call back.
-     */
-    @Callback
-    protected CallableReference<ConversationalServiceCallback> theCallbackRef;
-
-    /**
-     * Injected reference to the ComponentContext.
-     */
-    @Context
-    protected ComponentContext m_Ctx;
-
-    /**
-     * Some user data
-     */
-    private String m_UserData = DEFAULT_USER_DATA;
-
-    /**
-     * Constructor
-     */
-    public ConversationalServiceImpl() {
-    }
-
-    /**
-     * Used to inject the Conversation ID
-     * 
-     * @param a_ConversationID the Conversation ID
-     */
-    @ConversationID
-    public void setConversationID(Object a_ConversationID) {
-        m_ConversationID = a_ConversationID;
-    }
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    public Object getConversationID() {
-        return m_ConversationID;
-    }
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    public ServiceReference<ConversationalService> createSelfRef() {
-        return m_Ctx.createSelfReference(ConversationalService.class);
-    }
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    public void setUserData(String a_Data) {
-        m_UserData = a_Data;
-    }
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    public String getUserData() {
-        return m_UserData;
-    }
-
-    /**
-     * Method that triggers the callback.
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    public void triggerCallback(String msg) throws Exception {
-        Assert.assertNotNull(theCallbackRef);
-
-        // Serialize the CallableReference
-        byte[] serializedCR = ServiceReferenceUtils.serialize(theCallbackRef);
-        Assert.assertNotNull(serializedCR);
-
-        // Deserlaize the CallableReference
-        CallableReference<?> cr = ServiceReferenceUtils.deserializeCallableReference(serializedCR);
-        Assert.assertNotNull(cr);
-        CallableReference<ConversationalServiceCallback> regotCallbackRef 
-            = (CallableReference<ConversationalServiceCallback>) cr;
-
-        // Use the deseralized CallbackReference
-        regotCallbackRef.getService().callback(msg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
deleted file mode 100644
index a83f69a1e4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
+++ /dev/null
@@ -1,44 +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.itest.servicereference;
-
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application
- * 
- * @version $Date$ $Revision$
- */
-public interface SCAManagedClient {
-
-    /**
-     * Tests Serializing a Stateless ServiceReference
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeStatelessServiceReference() throws Exception;
-
-    /**
-     * Tests Serializing a Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
deleted file mode 100644
index 146123dd2b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
+++ /dev/null
@@ -1,90 +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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application
- * 
- * @version $Date$ $Revision$
- */
-@Service(SCAManagedClient.class)
-public class SCAManagedClientImpl implements SCAManagedClient, StatelessServiceCallback {
-
-    /**
-     * Injected reference to the StatelessService
-     */
-    @Reference(name = "statelessService")
-    protected ServiceReference<StatelessService> statelessServiceRef;
-
-    /**
-     * Tests Serializing a Stateless ServiceReference
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeStatelessServiceReference() throws Exception {
-        Assert.assertNotNull(statelessServiceRef);
-
-        StatelessService service = statelessServiceRef.getService();
-        service.getCurrentTime();
-        
-        // Serialize the ServiceReference
-        byte[] serializedSR = ServiceReferenceUtils.serialize(statelessServiceRef);
-        Assert.assertNotNull(serializedSR);
-
-        // Deserialize the ServiceReference
-        ServiceReference<?> deserializedSR = ServiceReferenceUtils.deserializeServiceReference(serializedSR);
-        Assert.assertNotNull(deserializedSR);
-        ServiceReference<StatelessService> regotServiceRef = (ServiceReference<StatelessService>) deserializedSR;
-        Assert.assertNotNull(regotServiceRef);
-
-        // Use the ServiceReference to access the Service.
-        StatelessService regotService = regotServiceRef.getService();
-        Assert.assertNotNull(regotService);
-    }
-
-    /**
-     * Simple callback method
-     * 
-     * @param msg The call back message
-     */
-    public void callback(String msg) {
-        System.out.println("Stateless Callback with message " + msg);
-    }
-    
-    /**
-     * Tests Serializing a Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception {
-        Assert.assertNotNull(statelessServiceRef);
-
-        StatelessService service = statelessServiceRef.getService();
-        String msg = "A message for the callback " + System.currentTimeMillis();
-        service.triggerCallback(msg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
deleted file mode 100644
index d8d35a4f7c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.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 org.apache.tuscany.sca.itest.servicereference;
-
-import org.osoa.sca.annotations.Conversational;
-
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application where the client that the Callback
- * is referring is actually Conversational.
- * 
- * @version $Rev$ $Date$
- */
-@Conversational
-public interface SCAManagedConversationalClient {
-
-    /**
-     * Tests Serializing a Conversational ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeConversationalServiceReference() throws Exception;
-
-    /**
-     * Tests Serializing a Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
deleted file mode 100644
index 469b9c38f9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
+++ /dev/null
@@ -1,107 +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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application
- * 
- * @version $Rev$ $Date$
- */
-@Service(SCAManagedConversationalClient.class)
-@Scope("CONVERSATION")
-public class SCAManagedConversationalClientImpl implements SCAManagedConversationalClient, ConversationalServiceCallback {
-
-    /**
-     * Injected reference to the ConversationalService.
-     */
-    @Reference(name = "conversationalService")
-    protected ServiceReference<ConversationalService> conversationalServiceRef;
-
-    /**
-     * This is the message that we sent to the callback.
-     */
-    private String messageSentToCallback;
-
-    /**
-     * Tests Serializing a Conversational ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeConversationalServiceReference() throws Exception {
-        Assert.assertNotNull(conversationalServiceRef);
-
-        ConversationalService service = conversationalServiceRef.getService();
-        Object origConvID = service.getConversationID();
-        Assert.assertNotNull(origConvID);
-
-        // Serialize the ServiceReference
-        byte[] serializedSR = ServiceReferenceUtils.serialize(conversationalServiceRef);
-        Assert.assertNotNull(serializedSR);
-
-        // Deserialize the ServiceReference
-        ServiceReference<?> deserializedSR = ServiceReferenceUtils.deserializeServiceReference(serializedSR);
-        Assert.assertNotNull(deserializedSR);
-        ServiceReference<ConversationalService> regotServiceRef = (ServiceReference<ConversationalService>) deserializedSR;
-        Assert.assertNotNull(regotServiceRef);
-
-        // Use the ServiceReference to access the Service.
-        ConversationalService regotService = regotServiceRef.getService();
-        Assert.assertNotNull(regotService);
-        Object regotConvID = regotService.getConversationID();
-        Assert.assertNotNull(regotConvID);
-
-        // Make sure we have the same Conversation ID
-        Assert.assertEquals(origConvID, regotConvID);
-    }
-
-
-    /**
-     * Tests Serializing a Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception {
-        Assert.assertNotNull(conversationalServiceRef);
-
-        ConversationalService service = conversationalServiceRef.getService();
-        messageSentToCallback = "A message for the callback " + System.currentTimeMillis();
-        service.triggerCallback(messageSentToCallback);
-    }
-    
-    /**
-     * Simple callback method.
-     * 
-     * @param msg The call back message
-     */
-    public void callback(String msg) {
-        System.out.println("Stateless Callback with message " + msg);
-
-        // Make sure we received the message we expected
-        Assert.assertEquals(messageSentToCallback, msg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
deleted file mode 100644
index 8a1fe48436..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
+++ /dev/null
@@ -1,46 +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.itest.servicereference;
-
-import org.osoa.sca.annotations.Callback;
-
-
-/**
- * A very simple Stateless Service
- *
- * @version $Date$ $Revision$
- */
-@Callback(StatelessServiceCallback.class)
-public interface StatelessService {
-
-    /**
-     * Gets the current time
-     * 
-     * @return The current time
-     */
-    String getCurrentTime();
-
-    /**
-     * Method that triggers the callback
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    void triggerCallback(String msg) throws Exception;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
deleted file mode 100644
index ffe3a3b8ef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
+++ /dev/null
@@ -1,34 +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.itest.servicereference;
-
-/**
- * This is the callback for the StatelessService
- *
- * @version $Date$ $Revision$
- */
-public interface StatelessServiceCallback {
-
-    /**
-     * Simple callback method
-     * 
-     * @param msg The message for the call back
-     */
-    void callback(String msg);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
deleted file mode 100644
index 24d43f79e3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
+++ /dev/null
@@ -1,82 +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.itest.servicereference;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple Stateless Service implementation
- * 
- * @version $Date$ $Revision$
- */
-@Service(StatelessService.class)
-public class StatelessServiceImpl implements StatelessService {
-
-    /**
-     * Injected reference to the call back
-     */
-    @Callback
-    protected CallableReference<StatelessServiceCallback> theCallbackRef;
-
-    /**
-     * Constructor
-     */
-    public StatelessServiceImpl() {
-    }
-
-    /**
-     * Gets the current time
-     * 
-     * @return The current time
-     */
-    public String getCurrentTime() {
-        SimpleDateFormat sdf = new SimpleDateFormat();
-        return sdf.format(new Date());
-    }
-
-    /**
-     * Method that triggers the callback
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    public void triggerCallback(String msg) throws Exception {
-        Assert.assertNotNull(theCallbackRef);
-
-        // Serialize the CallableReference
-        byte[] serializedCR = ServiceReferenceUtils.serialize(theCallbackRef);
-        Assert.assertNotNull(serializedCR);
-
-        // Deserlaize the CallableReference
-        CallableReference<?> cr = ServiceReferenceUtils.deserializeCallableReference(serializedCR);
-        Assert.assertNotNull(cr);
-        CallableReference<StatelessServiceCallback> regotCallbackRef 
-            = (CallableReference<StatelessServiceCallback>) cr;
-
-        // Use the deseralized CallbackReference
-        regotCallbackRef.getService().callback(msg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
deleted file mode 100644
index 2749891bd4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
+++ /dev/null
@@ -1,127 +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.itest.servicereference.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-/**
- * Utility methods that are used by the ServiceReference Serialization tests
- * 
- * @version $Date $Revision$
- */
-public final class ServiceReferenceUtils {
-
-    /**
-     * Constructor
-     */
-    private ServiceReferenceUtils() {
-    }
-
-    /**
-     * Serializes the specified Object to a byte[]
-     * 
-     * @param obj The Object to Serialize
-     * @return The Serialized Object as a byte[]
-     * @throws IOException Failed to Serialize the Object
-     */
-    public static byte[] serialize(Object obj) throws IOException {
-        ByteArrayOutputStream bos = null;
-        try {
-            ObjectOutputStream oos = null;
-            bos = new ByteArrayOutputStream();
-            try {
-                oos = new ObjectOutputStream(bos);
-                oos.writeObject(obj);
-                oos.flush();
-            } finally {
-                if (oos != null) {
-                    oos.close();
-                }
-            }
-        } finally {
-            if (bos != null) {
-                bos.close();
-            }
-        }
-
-        return bos.toByteArray();
-    }
-
-    /**
-     * Deserializes the specified byte[] into a ServiceReference
-     * 
-     * @param serializedSR The Serialized ServiceReference to deserialize
-     * @return The deserialized ServiceReference
-     * @throws IOException Failed to deserialize the ServiceReference
-     * @throws ClassNotFoundException Failed to deserialize the ServiceReference
-     */
-    public static ServiceReference<?> deserializeServiceReference(byte[] serializedSR)
-            throws IOException, ClassNotFoundException {
-        return (ServiceReference<?>) deserialize(serializedSR);
-    }
-
-    /**
-     * Deserializes the specified byte[] into a CallableReference
-     * 
-     * @param callableRef The Serialized CallableReference to deserialize
-     * @return The deserialized ServiceReference
-     * @throws IOException Failed to deserialize the CallableReference
-     * @throws ClassNotFoundException Failed to deserialize the CallableReference
-     */
-    public static CallableReference<?> deserializeCallableReference(byte[] callableRef)
-            throws IOException, ClassNotFoundException {
-        return (CallableReference<?>) deserialize(callableRef);
-    }
-
-    /**
-     * Deserializes the specified byte[] into an Object
-     * 
-     * @param serializedObj The Serialized Object to deserialize
-     * @return The deserialized Object
-     * @throws IOException Failed to deserialize the Object
-     * @throws ClassNotFoundException Failed to deserialize the Object
-     */
-    public static Object deserialize(byte[] serializedSR) throws IOException, ClassNotFoundException {
-        ByteArrayInputStream bis = null;
-        try {
-            ObjectInputStream ois = null;
-            bis = new ByteArrayInputStream(serializedSR);
-            try {
-                ois = new ObjectInputStream(bis);
-                Object obj = ois.readObject();
-                return obj;
-            } finally {
-                if (ois != null) {
-                    ois.close();
-                }
-            }
-        } finally {
-            if (bis != null) {
-                bis.close();
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/tags/java/sca/1.3-RC1a/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
deleted file mode 100644
index ebc8e667de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.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
-    * 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:foo="http://foo" targetNamespace="http://foo"
-    name="ServiceReferenceSerializationTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <component name="StatelessComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.StatelessServiceImpl" />
-    </component>
-
-    <component name="ConversationalComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.ConversationalServiceImpl" />
-    </component>
-
-    <component name="SCAManagedClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedClientImpl" />
-        <reference name="statelessService" target="StatelessComponent"/>
-    </component>
-
-    <component name="SCAManagedConversationalClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedConversationalClientImpl" />
-        <reference name="conversationalService" target="ConversationalComponent"/>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/tags/java/sca/1.3-RC1a/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
deleted file mode 100644
index bee2913cb5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
+++ /dev/null
@@ -1,117 +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.itest.servicereference;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * A test case that will attempt to Serialize and Deserialize Service References
- * 
- * @version $Date$ $Revision$
- */
-public class SerializeServiceReferenceTestCase {
-    /**
-     * Reference to the SCA Domain
-     */
-    private static SCADomain domain;
-
-    /**
-     * Initialise the SCA Domain
-     * 
-     * @throws Exception Failed to initialise the SCA Domain
-     */
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("ServiceReferenceSerializationTest.composite");
-        Assert.assertNotNull(domain);
-    }
-
-    /**
-     * Shutdown the SCA Domain
-     * 
-     * @throws Exception Failed to shutdown the SCA Domain
-     */
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * Tests Serializing a Stateless ServiceReference as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeStatelessServiceReferenceInsideSCA() throws Exception {
-        SCAManagedClient client = domain.getService(
-                SCAManagedClient.class, "SCAManagedClientComponent");
-
-        client.testSerializeStatelessServiceReference();
-    }
-
-    /**
-     * Tests Serializing a Conversational ServiceReference as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeConversationalServiceReferenceInsideSCA() throws Exception {
-        SCAManagedConversationalClient client = domain.getService(
-                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
-
-        client.testSerializeConversationalServiceReference();
-    }
-
-    /**
-     * Tests Serializing a Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception {
-        SCAManagedClient client = domain.getService(
-                SCAManagedClient.class, "SCAManagedClientComponent");
-
-        client.testSerializeCallbackToStatelessServiceInsideSCA();
-    }
-
-    /**
-     * Tests Serializing a Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception {
-        SCAManagedConversationalClient client = domain.getService(
-                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
-
-        client.testSerializeCallbackToConversationalServiceInsideSCA();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/pom.xml b/tags/java/sca/1.3-RC1a/itest/services/pom.xml
deleted file mode 100644
index 367eca881a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/pom.xml
+++ /dev/null
@@ -1,46 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-services</artifactId>
-    <name>Apache Tuscany SCA Services Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
deleted file mode 100644
index 1304ba4288..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.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 org.apache.tuscany.sca.itest.services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AComponent {
-	String foo();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
deleted file mode 100644
index 3577e09add..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.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 org.apache.tuscany.sca.itest.services;
-
-public class AComponentImpl implements AComponent {
-
-	public String foo() {
-		return "AComponent";
-	}
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
deleted file mode 100644
index 2e9b56d64d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.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 org.apache.tuscany.sca.itest.services;
-
-public interface BComponent {
-
-	String foo();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
deleted file mode 100644
index cda3f38636..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ /dev/null
@@ -1,31 +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.itest.services;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
-	public String foo() {
-		return "BComponent";
-	}
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
deleted file mode 100644
index 39806a8101..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.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 org.apache.tuscany.sca.itest.services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CComponent {
-    String foo();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
deleted file mode 100644
index 8713e5ab22..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.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 org.apache.tuscany.sca.itest.services;
-
-public class CComponentImpl implements CComponent {
-
-    public String foo() {
-        return "CComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
deleted file mode 100644
index aa745deb63..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.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 org.apache.tuscany.sca.itest.services;
-
-
-public interface D1Component {
-	String foo1();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
deleted file mode 100644
index 83da15089f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.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 org.apache.tuscany.sca.itest.services;
-
-
-public interface DComponent {
-	String foo();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
deleted file mode 100644
index 36189f94bb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ /dev/null
@@ -1,34 +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.itest.services;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(interfaces = {DComponent.class, D1Component.class})
-public class DComponentImpl implements DComponent, D1Component {
-
-    public String foo() {
-        return "DComponent";
-    }
-
-    public String foo1() {
-        return "DComponent";
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/services/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 37ea8f677d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/resources/META-INF/sca-contribution.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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://foo" xmlns:foo="http://foo">
-    <deployable composite="foo:InnerServicesTest" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/main/resources/ServicesTest.composite b/tags/java/sca/1.3-RC1a/itest/services/src/main/resources/ServicesTest.composite
deleted file mode 100644
index eda885f9ec..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/main/resources/ServicesTest.composite
+++ /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.    

--->

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

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

-

-    <component name="AComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.AComponentImpl" />

-    </component>

-    

-    <component name="AComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.AComponentImpl" />

-	    <service name="AComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.AComponent" />

-	    </service>

-    </component> 

-

-    <component name="BComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.BComponentImpl" />

-    </component>

-    

-    <component name="BComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.BComponentImpl" />

-	    <service name="BComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.BComponent" />

-	    </service>

-    </component> 

-

-    <component name="CComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.CComponentImpl" />

-    </component>

-    

-    <component name="CComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.CComponentImpl" />

-	    <service name="CComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.CComponent" />

-	    </service>

-    </component> 

-    

-    <component name="DComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.DComponentImpl" />

-    </component>

-    

-    <component name="DComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.DComponentImpl" />

-	    <service name="DComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.DComponent" />

-	    </service>

-	    <service name="D1Component">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.D1Component" />

-	    </service>

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/tags/java/sca/1.3-RC1a/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
deleted file mode 100644
index ba6cac279c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ /dev/null
@@ -1,105 +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.itest.services;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class ServicesTestCase {
-    private static SCADomain domain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        if (domain == null) {
-            domain = SCADomain.newInstance("ServicesTest.composite");
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testAService() {
-        AComponent a1 = domain.getService(AComponent.class, "AComponent1");
-        assertEquals("AComponent", a1.foo());
-
-        AComponent a2 = domain.getService(AComponent.class, "AComponent2/AComponent");
-        assertEquals("AComponent", a2.foo());
-    }
-
-    @Test
-    public void testBService() {
-        BComponent a1 = domain.getService(BComponent.class, "BComponent1");
-        assertEquals("BComponent", a1.foo());
-
-        BComponent a2 = domain.getService(BComponent.class, "BComponent2/BComponent");
-        assertEquals("BComponent", a2.foo());
-    }
-
-    @Test
-    public void testCService() {
-        CComponent a1 = domain.getService(CComponent.class, "CComponent1");
-        assertEquals("CComponent", a1.foo());
-
-        CComponent a2 = domain.getService(CComponent.class, "CComponent2/CComponent");
-        assertEquals("CComponent", a2.foo());
-    }
-
-    @Test
-    public void testDService() {
-        DComponent a1 = domain.getService(DComponent.class, "DComponent1/DComponent");
-        assertEquals("DComponent", a1.foo());
-
-        D1Component a2 = domain.getService(D1Component.class, "DComponent1/D1Component");
-        assertEquals("DComponent", a2.foo1());
-
-        try {
-            domain.getService(DComponent.class, "DComponent1");
-            Assert.fail("The service name is required");
-        } catch (ServiceRuntimeException e) {
-            Assert.assertTrue("The service name is required", true);
-        }
-
-        DComponent a3 = domain.getService(DComponent.class, "DComponent2/DComponent");
-        assertEquals("DComponent", a3.foo());
-
-        D1Component a4 = domain.getService(D1Component.class, "DComponent2/D1Component");
-        assertEquals("DComponent", a4.foo1());
-
-    }
-
-    public static void main(String[] args) throws Exception {
-        ServicesTestCase.init();
-        ServicesTestCase tester = new ServicesTestCase();
-        tester.testAService();
-        tester.testBService();
-        tester.testCService();
-        tester.testDService();
-        ServicesTestCase.destroy();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/pom.xml b/tags/java/sca/1.3-RC1a/itest/spring/pom.xml
deleted file mode 100644
index f87b34bda3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/pom.xml
+++ /dev/null
@@ -1,80 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-spring</artifactId>
-    <name>Apache Tuscany SCA Implementation.spring Integration Tests</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Spring dependencies... -->    
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
deleted file mode 100644
index 7068224183..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.springframework.org/schema/sca/spring-sca.xsd">
-
-    <bean id="delegateBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-    <bean id="testBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true">
-         <property name="delegate"><ref bean="delegateBean"/></property>
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index 3b87979ab2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.springframework.org/schema/sca/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
deleted file mode 100644
index 70b2d5fdab..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.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://www.osoa.org/xmlns/sca/1.0"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringDelegationHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
deleted file mode 100644
index bab9ecb528..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.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://www.osoa.org/xmlns/sca/1.0"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
deleted file mode 100644
index 634e3d34af..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ /dev/null
@@ -1,40 +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.itest.spring;
-
-
-/**
- * Basic "hello world" style test case for testing Spring component implementation
- *
- */
-public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
-
-    /**
-     * Calls the hello world service and checks that it gives the right response...
-     */
-    public void testHello() throws Exception {
-        assertEquals("Hello petra", service.sayHello("petra"));
-    }
-
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
deleted file mode 100644
index e0b1a79c95..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.itest.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public abstract class AbstractSCATestCase<T> extends TestCase {
-
-    protected SCADomain domain;
-    protected T service;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
-        service = (T)domain.getService(getServiceClass(), "ClientComponent");
-    }
-
-    abstract protected Class getServiceClass();
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        String compositeName = className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-        System.out.println("Using composite: " + compositeName);
-        return compositeName;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
deleted file mode 100644
index 3957e49bf3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ /dev/null
@@ -1,34 +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.itest.spring;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Interface for the "hello world" service - predictably simple with a single operation
- * "sayHello"
- *
- */
-@Remotable
-public interface HelloWorld {
-
-    public String sayHello(String s);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
deleted file mode 100644
index d75d19295d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ /dev/null
@@ -1,41 +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.itest.spring;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    // Here is the reference "delegate" - it implements the HelloWorld interface...
-    @Reference
-    public HelloWorld delegate;
-
-    public String sayHello(String s) {
-        // Simply call the reference to satisfy the service request...
-        System.out.println("HelloWorldProxy - calling sayHello");
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
deleted file mode 100644
index 4088691ccd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ /dev/null
@@ -1,31 +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.itest.spring;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- *
- */
-public class SpringDelegationHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
deleted file mode 100644
index 840bf59b73..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ /dev/null
@@ -1,32 +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.itest.spring;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- * 3) The Spring component delegates function to a second spring bean
- *
- */
-public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
deleted file mode 100644
index fa7967c964..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.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 org.apache.tuscany.sca.itest.spring;
-
-/**
- * A simple test Spring bean which provides the HelloWorld service
- *
- */
-
-public class TestHelloWorldBean implements HelloWorld {
-
-    static String hello = "Hello ";
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldBean - sayHello called");
-        return (hello + message);
-    }
-
-} // end class TestHelloWorldBean
diff --git a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
deleted file mode 100644
index b57cc7f366..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ /dev/null
@@ -1,40 +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.itest.spring;
-
-/**
- * A simple test Spring bean which delgates to another bean
- *
- */
-
-public class TestHelloWorldDelegatorBean implements HelloWorld {
-
-	HelloWorld delegate;
-	
-	public void setDelegate(HelloWorld delegate) {
-		this.delegate = delegate;
-	}
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldDelegatorBean - sayHello called");
-        return delegate.sayHello(message);
-    }
-
-} 
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/pom.xml b/tags/java/sca/1.3-RC1a/itest/transaction/pom.xml
deleted file mode 100644
index 1b5606e75e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/pom.xml
+++ /dev/null
@@ -1,91 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-transaction</artifactId>
-    <name>Apache Tuscany SCA Transaction Policy Integration Test</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-        </dependency>
-
-        <!-- 
-            <dependency>
-            <groupId>jotm</groupId>
-            <artifactId>jotm</artifactId>
-            <version>2.0.10</version>
-            <exclusions>
-            <exclusion>
-            <artifactId>jta</artifactId>
-            <groupId>javax.transaction</groupId>
-            </exclusion>
-            <exclusion>
-            <artifactId>connector</artifactId>
-            <groupId>javax.resource</groupId>
-            </exclusion>
-            </exclusions>
-            </dependency>
-        -->
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
deleted file mode 100644
index d7d18181d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.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 org.apache.tuscany.sca.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AccountNotFoundException extends Exception {
-    private static final long serialVersionUID = -4709084750220950706L;
-
-    public AccountNotFoundException() {
-        super();
-    }
-
-    public AccountNotFoundException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
deleted file mode 100644
index ac986dd417..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ /dev/null
@@ -1,31 +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.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AccountService {
-    float getBalance(String accountNumber) throws AccountNotFoundException;
-
-    void deposit(String accountNumber, float amount) throws AccountNotFoundException;
-
-    void withdraw(String accountNumber, float amount) throws OverDraftException, AccountNotFoundException;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
deleted file mode 100644
index a6ea036da7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ /dev/null
@@ -1,70 +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.itest.transaction;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public abstract class AccountServiceImpl implements AccountService {
-    protected Map<String, Float> accounts = new HashMap<String, Float>();
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#deposit(String, float)
-     */
-    public void deposit(String accountNumber, float amount) throws AccountNotFoundException {
-        float balance = getBalance(accountNumber);
-        balance += amount;
-        save(accountNumber, balance);
-        accounts.put(accountNumber, balance);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#getBalance(String)
-     */
-    public float getBalance(String accountNumber) throws AccountNotFoundException {
-        Float balance = accounts.get(accountNumber);
-        if (balance == null) {
-            balance = load(accountNumber);
-            accounts.put(accountNumber, balance);
-        }
-        return balance;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#withdraw(String, float)
-     */
-    public void withdraw(String accountNumber, float amount) throws OverDraftException, AccountNotFoundException {
-        float balance = getBalance(accountNumber);
-        if (amount > balance) {
-            throw new OverDraftException("Insufficient fund");
-        }
-        balance -= amount;
-        save(accountNumber, balance);
-        accounts.put(accountNumber, balance);
-    }
-
-    protected abstract float load(String accountNumber) throws AccountNotFoundException;
-
-    protected abstract void save(String accountNumber, float balance) throws AccountNotFoundException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
deleted file mode 100644
index 3e1cb29f33..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ /dev/null
@@ -1,143 +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.itest.transaction;
-
-import java.io.File;
-import java.util.Enumeration;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.broker.BrokerService;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-@Scope("COMPOSITE")
-public class CheckingAccountServiceImpl extends AccountServiceImpl {
-    private static final String url = "tcp://localhost:61616";
-    private BrokerService broker;
-    private Queue queue;
-
-    @Init
-    public void init() throws Exception {
-        broker = new BrokerService();
-        broker.setBrokerName("localhost");
-        broker.setPersistent(false);
-        broker.addConnector(url);
-        broker.start();
-
-        ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-        Connection conn = connFac.createConnection();
-        ActiveMQSession session = (ActiveMQSession)conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-        queue = session.createQueue("CheckAccounts");
-        MessageProducer producer = session.createProducer(queue);
-        MapMessage map = session.createMapMessage();
-
-        for (int i = 0; i < 3; i++) {
-            String accountNumber = "C00" + (i + 1);
-            float balance = (float)(1000.0 + Math.random() * 200.0);
-            map.setStringProperty("accountNumber", accountNumber);
-            map.setFloatProperty("balance", balance);
-
-            map.setString("accountNumber", accountNumber);
-            map.setFloat("balance", balance);
-
-            producer.send(map);
-        }
-        session.commit();
-        conn.close();
-    }
-
-    @Destroy
-    public void destroy() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-    @Override
-    protected float load(String accountNumber) throws AccountNotFoundException {
-        try {
-            ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-            Connection conn = connFac.createConnection();
-            conn.start();
-            Session session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            QueueBrowser browser = session.createBrowser(queue, "accountNumber = '" + accountNumber + "'");
-            Enumeration msgs = browser.getEnumeration();
-            if (msgs.hasMoreElements()) {
-                MapMessage msg = (MapMessage)msgs.nextElement();
-                float balance = msg.getFloat("balance");
-                conn.close();
-                return balance;
-            } else {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (JMSException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    protected void save(String accountNumber, float balance) throws AccountNotFoundException {
-        try {
-            ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-            Connection conn = connFac.createConnection();
-            conn.start();
-            ActiveMQSession session = (ActiveMQSession)conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            MessageConsumer consumer = session.createConsumer(queue, "accountNumber = '" + accountNumber + "'");
-            Message msg = consumer.receive(1000);
-            if (msg == null) {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-            MapMessage map = session.createMapMessage();
-            map.setStringProperty("accountNumber", accountNumber);
-            map.setFloatProperty("balance", balance);
-
-            map.setString("accountNumber", accountNumber);
-            map.setFloat("balance", balance);
-
-            MessageProducer producer = session.createProducer(queue);
-            producer.send(map);
-            conn.close();
-
-        } catch (JMSException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
deleted file mode 100644
index 4d504a6a36..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.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 org.apache.tuscany.sca.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OverDraftException extends Exception {
-    private static final long serialVersionUID = -4709084750220950706L;
-
-    public OverDraftException() {
-        super();
-    }
-
-    public OverDraftException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
deleted file mode 100644
index 156b34227d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ /dev/null
@@ -1,133 +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.itest.transaction;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.XAConnection;
-
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-@Scope("COMPOSITE")
-public class SavingsAccountServiceImpl extends AccountServiceImpl {
-    private final static Logger log = Logger.getLogger(SavingsAccountServiceImpl.class.getName());
-    private EmbeddedXADataSource xads;
-
-    @Init
-    public void init() throws SQLException {
-        // Create the database and a table
-        xads = new EmbeddedXADataSource();
-        xads.setDatabaseName("target/test");
-        xads.setCreateDatabase("create");
-
-        XAConnection xaconn = xads.getXAConnection();
-        Connection conn = xaconn.getConnection();
-        PreparedStatement ps =
-            conn.prepareStatement("create table SavingsAccounts(accountNumber char(100), balance float)");
-        try {
-            ps.execute();
-        } catch (SQLException ex) {
-            log.info(ex.getMessage());
-        }
-        ps = conn.prepareStatement("delete from SavingsAccounts");
-        ps.execute();
-        
-        ps = conn.prepareStatement("insert into SavingsAccounts(accountNumber, balance) values(?, ?)");
-        for (int i = 0; i < 2; i++) {
-            ps.setString(1, "S00" + (i+1));
-            ps.setFloat(2, (float)(1000.0f + Math.random() * 500.0));
-            ps.executeUpdate();
-        }
-        conn.commit();
-        conn.close();
-    }
-
-    @Override
-    protected float load(String accountNumber) throws AccountNotFoundException {
-        try {
-            XAConnection xaconn = xads.getXAConnection();
-
-            Connection conn = xaconn.getConnection();
-            PreparedStatement ps = conn.prepareStatement("select balance from SavingsAccounts where accountNumber=?");
-            ps.setString(1, accountNumber);
-            ResultSet rs1 = ps.executeQuery();
-            boolean found = rs1.next();
-            if (found) {
-                float balance = rs1.getFloat(1);
-                conn.commit();
-                conn.close();
-                return balance;
-            } else {
-                conn.commit();
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    protected void save(String accountNumber, float balance) throws AccountNotFoundException {
-        try {
-            XAConnection xaconn = xads.getXAConnection();
-
-            Connection conn = xaconn.getConnection();
-            PreparedStatement ps = conn.prepareStatement("update SavingsAccounts set balance=? where accountNumber=?");
-            ps.setFloat(1, balance);
-            ps.setString(2, accountNumber);
-            int rows = ps.executeUpdate();
-            conn.commit();
-            boolean found = (rows >= 1);
-            if (found) {
-                conn.close();
-            } else {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Destroy
-    public void destroy() throws SQLException {
-        XAConnection xaconn = xads.getXAConnection();
-        Connection conn = xaconn.getConnection();
-        PreparedStatement ps = conn.prepareStatement("drop table SavingsAccounts");
-        ps.execute();
-        conn.commit();
-        conn.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
deleted file mode 100644
index b7ea5f2663..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ /dev/null
@@ -1,31 +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.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TransferService {
-    String[] getAccounts();
-
-    float getBalance(String accountNumber) throws AccountNotFoundException;
-
-    void transfer(String from, String to, float amount) throws OverDraftException, AccountNotFoundException;
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
deleted file mode 100644
index 341a7e53e3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ /dev/null
@@ -1,64 +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.itest.transaction;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TransferService.class)
-public class TransferServiceImpl implements TransferService {
-    @Reference
-    protected AccountService savings;
-
-    @Reference
-    protected AccountService checking;
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.TransferService#transfer(java.lang.String, java.lang.String, float)
-     */
-    public void transfer(String from, String to, float amount) throws OverDraftException, AccountNotFoundException {
-        if (from.startsWith("C")) {
-            checking.withdraw(from, amount);
-        } else {
-            savings.withdraw(from, amount);
-        }
-        if (to.startsWith("C")) {
-            checking.deposit(to, amount);
-        } else {
-            savings.deposit(to, amount);
-        }
-    }
-    
-    public float getBalance(String accountNumber) throws AccountNotFoundException {
-        if(accountNumber.startsWith("C")) {
-            return checking.getBalance(accountNumber);
-        } else {
-            return savings.getBalance(accountNumber);
-        }
-    }
-
-    public String[] getAccounts() {
-        return new String[] {"S001", "S002", "C001"};
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/accounts.composite b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/accounts.composite
deleted file mode 100644
index f4c6b650c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/accounts.composite
+++ /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.    

--->

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

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

-

-    <component name="TransferServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.TransferServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="TransferService" />

-        <reference name="savings" requires="propagatesTransaction" target="SavingsAccountServiceComponent"></reference>

-        <reference name="checking" requires="propagatesTransaction" target="CheckingAccountServiceComponent"></reference>

-    </component>

-

-    <component name="SavingsAccountServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.SavingsAccountServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="AccountService" requires="propagatesTransaction" />

-    </component>

-

-    <component name="CheckingAccountServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.CheckingAccountServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="AccountService" requires="propagatesTransaction" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/definitions.xml b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/definitions.xml
deleted file mode 100644
index 8aa6ba313a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,99 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <policySet name="tuscany:ManagedTransactionPolicySet" provides="managedTransaction" appliesTo="sca:implementation.java">
-        <intentMap provides="managedTransaction" default="global">
-            <qualifier name="global">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_GLOBAL" />
-            </qualifier>
-            <qualifier name="local">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_LOCAL" />
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="tuscany:NoManagedTransactionPolicySet" provides="noManagedTransaction"
-        appliesTo="implementation">
-        <tuscany:transactionPolicy action="REQUIRE_NONE" />
-    </policySet>
-
-    <policySet name="tuscany:PropagatesTransactionPolicySet" provides="propagatesTransaction" appliesTo="sca:component">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="tuscany:SuspendsTransactionPolicySet" provides="suspendsTransaction" appliesTo="sca:binding.sca">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <policySet name="tuscany:TransactedOneWayPolicySet" provides="transactedOneWay" appliesTo="sca:binding.sca">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="tuscany:ImmediateOneWayPolicySet" provides="immediateOneWay" appliesTo="sca:binding.sca">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <intent name="managedTransaction" constrains="implementation">
-        <description>Used to indicate the transaction environment desired by a component implementation.</description>
-    </intent>
-    <intent name="managedTransaction.global">
-        <description>
-            Used to indicate that a component implementation requires a managed global transaction.
-        </description>
-    </intent>
-    <intent name="managedTransaction.local">
-        <description>
-            Used to indicate that a component implementation requires a managed local transaction.
-        </description>
-    </intent>
-    <intent name="noManagedTransaction" constrains="implementation">
-        <description>
-            Used to indicate that a component implementation will manage its own transaction resources.
-        </description>
-    </intent>
-    <intent name="propagatesTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will propagate any client transaction or that a service will be dispatched
-            under any received transaction.
-        </description>
-    </intent>
-    <intent name="suspendsTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will not propagate any client transaction or that a service will not be
-            dispatched under any received transaction.
-        </description>
-    </intent>
-    <intent name="transactedOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to transact OneWay send of messages as part of
-            any client global transaction or to transact oneWay message receipt as part of any service global
-            transaction.
-        </description>
-    </intent>
-    <intent name="immediateOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to process the sending or receiving of OneWay
-            messages immediately, regardless of any transaction under which the sending/receiving component runs.
-        </description>
-    </intent>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/log4j.properties b/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +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 root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, CONSOLE
-
-# CONSOLE is set to be a ConsoleAppender.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-
-
-# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.tuscany=INFO
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
deleted file mode 100644
index c23628ff91..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
+++ /dev/null
@@ -1,119 +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.itest.transaction;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.XAConnection;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import junit.framework.TestCase;
-
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.apache.tuscany.sca.policy.transaction.TransactionManagerHelper;
-import org.apache.tuscany.sca.policy.transaction.TransactionManagerWrapper;
-
-public class ConcurrentXAResourceTestCase extends TestCase {
-    class TestThread extends Thread {
-        private int counter;
-
-        TestThread(int i) {
-            counter = i;
-        }
-
-        public void run() {
-            log.info(this + " running...");
-
-            EmbeddedXADataSource xads = new EmbeddedXADataSource();
-            xads.setDatabaseName("target/test" + counter);
-            xads.setCreateDatabase("create");
-            Connection conn = null;
-            try {
-
-                Transaction trans = helper.managedGlobalTransactionPreInvoke();
-
-                XAConnection xaconn = xads.getXAConnection();
-
-                trans.enlistResource(xaconn.getXAResource());
-
-                conn = xaconn.getConnection();
-                try {
-                    conn.prepareStatement("create table T1(col1 char(100))").execute();
-                } catch (SQLException ex) {
-                    log.info("table T1 exists");
-                }
-                conn.prepareStatement("insert into T1 values('kkkkkkkk')").execute();
-                ResultSet rs = conn.prepareStatement("select count(*) from T1").executeQuery();
-                rs.next();
-                log.info(String.valueOf(rs.getInt(1)));
-
-                helper.managedGlobalTransactionPostInvoke(trans, false);
-
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            } finally {
-                try {
-                    conn.close();
-                } catch (Exception _ex) {
-                    _ex.printStackTrace();
-                }
-            }
-        }
-
-    }
-    private TransactionManagerWrapper activator;
-    private TransactionManagerHelper helper;
-
-    private Logger log = Logger.getLogger(this.getClass().getName());
-
-    public void setUp() throws Exception {
-        activator = new TransactionManagerWrapper();
-        activator.start();
-        TransactionManager tm = activator.getTransactionManager();
-        helper = new TransactionManagerHelper(tm);
-    }
-
-    public void tearDown() throws Exception {
-        activator.stop();
-
-    }
-
-    public void testConcurrent() {
-        TestThread[] tts = new TestThread[5];
-        for (int i = 0; i < tts.length; i++) {
-            tts[i] = new TestThread(i);
-            tts[i].start();
-            // log.info("one TestThread started...");
-        }
-        try {
-            for (TestThread tt : tts) {
-                while (tt != null && tt.isAlive()) {
-                    // log.info("wait for...");
-                    Thread.sleep(200);
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/tags/java/sca/1.3-RC1a/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
deleted file mode 100644
index 36884f6098..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ /dev/null
@@ -1,53 +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.itest.transaction;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TransactionTestCase {
-    private static SCADomain domain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("accounts.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testTransaction() throws Exception {
-        TransferService service = domain.getService(TransferService.class, "TransferServiceComponent");
-        String[] accounts = service.getAccounts();
-        for (int i = 0; i < accounts.length; i++) {
-            float balance = service.getBalance(accounts[i]);
-            System.out.println("[" + i + "] " + accounts[i] + ":" + balance);
-        }
-        service.transfer(accounts[0], accounts[2], 200.0f);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/pom.xml b/tags/java/sca/1.3-RC1a/itest/validation/pom.xml
deleted file mode 100644
index f9e0e5c4a6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/pom.xml
+++ /dev/null
@@ -1,183 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-validation</artifactId>
-    <name>Apache Tuscany SCA Validation Integration Test</name>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-               
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <version>2.1.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-connector</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-persistence-jpa10</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-ejbd</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-loader</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-jee</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-ejbd</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-javaagent</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </exclusion>
-
-            </exclusions>
-
-        </dependency>
-        
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/account/Customer.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/account/Customer.java
deleted file mode 100644
index acb74c38ae..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ /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.    
- */
-package binding.ejb.account;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Customer {
-
-    /**
-     * This method deposits the amount. method accesses external EJB to get the 
-     * current balance and add the amount to existing balance.
-     *
-     * @param String amount to be deposited
-     * @return total amount in customer account after deposit
-     */
-    Double depositAmount(java.lang.String accountNo, Double amount);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
deleted file mode 100644
index 52ddfa9aba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ /dev/null
@@ -1,57 +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 binding.ejb.account;
-
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import binding.ejb.calculator.AddService;
-
-@Service(Customer.class)
-public class CustomerImpl implements Customer {
-
-    private AddService extEJBService = null;
-
-    public AddService getExtEJBService() {
-        return extEJBService;
-    }
-
-    @Reference
-    public void setExtEJBService(AddService extEJBService) {
-        this.extEJBService = extEJBService;
-    }
-
-    // this method invokes external EJB through EJB reference binding
-    public Double depositAmount(java.lang.String accountNo, Double amount) {
-         
-        Double total = null;
-
-        System.out.println("In component implementation. Invoking external EJB through EJB reference binding  ");
-
-        try {
-            Double balance = extEJBService.add(amount.doubleValue(), 1000); //invoke external ejb through ejb reference binding 
-            total =  balance + amount; 
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return total;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
deleted file mode 100644
index aec8998083..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/calculator/AddService.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 binding.ejb.calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AddService {
-    double add(double n1, double n2);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
deleted file mode 100644
index 5df24b6379..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ /dev/null
@@ -1,31 +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 binding.ejb.calculator;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface AddServiceHome extends EJBHome {
-
-    AddService create() throws CreateException, RemoteException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/jms/HelloWorldService.java
deleted file mode 100644
index 33bfe1d0ea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ /dev/null
@@ -1,26 +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 binding.jms;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index a6a40b0ed1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.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 binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        return "jmsHello " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddService.java
deleted file mode 100644
index 35ba2cbfac..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddService.java
+++ /dev/null
@@ -1,32 +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 calculator.warning;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-    String getServiceName();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
deleted file mode 100644
index ef305370cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ /dev/null
@@ -1,44 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-	@Property(name="serviceName")
-	protected String serviceName = "addService";
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-    public String getServiceName(){
-	  return serviceName;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
deleted file mode 100644
index aacde27842..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ /dev/null
@@ -1,46 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImplWithServiceName implements AddService {
-
-	@Property(name="serviceName")
-	protected String serviceName = "addService";
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-    public String getServiceName(){
-	  return serviceName;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
deleted file mode 100644
index 185f17a5ca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorClient.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 calculator.warning;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorService.java
deleted file mode 100644
index f472d6aaf6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ /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.    
- */
-package calculator.warning;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
deleted file mode 100644
index 77aafe83de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/DivideService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/DivideService.java
deleted file mode 100644
index a93d23e61c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/DivideService.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 calculator.warning;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
deleted file mode 100644
index 080594034b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ /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.    
- */
-package calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/MultiplyService.java
deleted file mode 100644
index 20d48e93d5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/MultiplyService.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 calculator.warning;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
deleted file mode 100644
index 96f0b55fa2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ /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.    
- */
-package calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/PropertyService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/PropertyService.java
deleted file mode 100644
index 4f1ccc96f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ /dev/null
@@ -1,29 +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 calculator.warning;
-
-/**
- * The Property service interface
- */
-public interface PropertyService {
-
-    String getFirstName();
-    String getLastName();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
deleted file mode 100644
index 429daf5f2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ /dev/null
@@ -1,41 +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 calculator.warning;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * An implementation of the Property service
- */
-public class PropertyServiceImpl implements PropertyService {
-
-	@Property(name="firstName", required=false)
-	protected String firstName;
-
-	@Property(name="lastName", required=true)
-	protected String lastName;
-
-    public String getFirstName(){
-	  return firstName;
-    }
-
-    public String getLastName(){
-	  return lastName;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractService.java
deleted file mode 100644
index 40e382dc74..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractService.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 calculator.warning;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
deleted file mode 100644
index 8cdbe0813d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ /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.    
- */
-package calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
deleted file mode 100644
index d5e9fcf020..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-public class SubtractServiceImplWithServiceName implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/AddService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/AddService.java
deleted file mode 100644
index 0db8ce4f5c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/AddService.java
+++ /dev/null
@@ -1,29 +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 impl.java;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-    String getServiceName();
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/AddServiceImpl.java
deleted file mode 100644
index 83f2685d54..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ /dev/null
@@ -1,44 +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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-	@Property(name="serviceName")
-	protected String serviceName = "addService";
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-    public String getServiceName(){
-	  return serviceName;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorClient.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorClient.java
deleted file mode 100644
index e34ce3db26..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorClient.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 impl.java;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorService.java
deleted file mode 100644
index 5d583fd604..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ /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.    
- */
-package impl.java;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
deleted file mode 100644
index 0183e2a259..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,75 +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 impl.java;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-    
-    @Reference
-    private void add(int n1, int n2) {
-    	
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/DivideService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/DivideService.java
deleted file mode 100644
index 85ebadc9a0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/DivideService.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 impl.java;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
deleted file mode 100644
index 863c298234..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ /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.    
- */
-package impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/MultiplyService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/MultiplyService.java
deleted file mode 100644
index e1bf7fbddc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/MultiplyService.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 impl.java;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
deleted file mode 100644
index 6346ea3582..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ /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.    
- */
-package impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/SubtractService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/SubtractService.java
deleted file mode 100644
index 57759bb496..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/SubtractService.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 impl.java;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
deleted file mode 100644
index 16e3e6a23d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ /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.    
- */
-package impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
deleted file mode 100644
index 6f9df2c034..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
+++ /dev/null
@@ -1,50 +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 impl.osgi;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * 
- * Test class - Implementation of an OSGi service
- *
- */
-public class OSGiTestImpl implements OSGiTestInterface, BundleActivator {
-    
-    public String testService() {
-        
-        return OSGiTestImpl.class.getName();
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
deleted file mode 100644
index bafff878cd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
+++ /dev/null
@@ -1,31 +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 impl.osgi;
-
-/**
- *
- * Test class - Interface for an OSGi service
- *
- */
-public interface OSGiTestInterface {
-
-    String testService() throws Exception ;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
deleted file mode 100644
index e44d93e6be..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
+++ /dev/null
@@ -1,65 +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 impl.osgi;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osoa.sca.annotations.Property;
-
-/**
- * 
- * Test class - Implementation of an OSGi service
- *
- */
-public class OSGiTestWithPropertyImpl implements OSGiTestInterface, BundleActivator {
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public String testService() throws Exception {
-        
-        if (exchangeRate != 2.0)
-            throw new Exception("Property exchangeRate not set correctly, expected 2.0, got " + exchangeRate);
-        if (!"USD".equals(currency))
-            throw new Exception("Property currency not set correctly, expected USD, got " + currency);
-        return OSGiTestWithPropertyImpl.class.getName();
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/HelloWorld.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/HelloWorld.java
deleted file mode 100644
index ef0b491617..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/HelloWorld.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 impl.spring;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Interface for the "hello world" service - predictably simple with a single operation
- * "sayHello"
- *
- */
-@Remotable
-public interface HelloWorld {
-
-	@OneWay
-    String sayHello(String s);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
deleted file mode 100644
index 2e3458f0d3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ /dev/null
@@ -1,41 +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 impl.spring;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    // Here is the reference "delegate" - it implements the HelloWorld interface...
-    @Reference
-    public HelloWorld delegate;
-
-    public String sayHello(String s) {
-        // Simply call the reference to satisfy the service request...
-        System.out.println("HelloWorldProxy - calling sayHello");
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
deleted file mode 100644
index 87904f2a72..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.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 impl.spring;
-
-/**
- * A simple test Spring bean which provides the HelloWorld service
- *
- */
-
-public class TestHelloWorldBean implements HelloWorld {
-
-    static String hello = "Hello ";
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldBean - sayHello called");
-        return (hello + message);
-    }
-
-} // end class TestHelloWorldBean
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
deleted file mode 100644
index fa1a621f12..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ /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.    
- */
-package interfacejava.xml;
-
-import org.osoa.sca.annotations.OneWay;
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-    
-    @OneWay
-    double divide(double n1, double n2);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
deleted file mode 100644
index ebf7a79589..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,75 +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 interfacejava.xml;
-
-import org.osoa.sca.annotations.Reference;
-
-import calculator.warning.AddService;
-import calculator.warning.DivideService;
-import calculator.warning.MultiplyService;
-import calculator.warning.SubtractService;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
deleted file mode 100644
index b2e7da05a2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent_one" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
deleted file mode 100644
index 4ba9f0724b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>    
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
deleted file mode 100644
index b935dd194a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>  
-
-    <component name="AddServiceComponent_one">
-        <implementation.composite name="sample:dummyImplementation">
-		<property name="serviceName" type="xsd:anyURI">addService</property>
-        </implementation.composite>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
deleted file mode 100644
index 2b633f3139..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="dummyImplementation">
-
-    <property name="serviceName" type="xsd:anyURI">addService</property>
-    <property name="serviceName" type="xsd:anyURI">addService</property>
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>  
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
deleted file mode 100644
index 940e27a1e7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-
-    <component name="CalculatorServiceComponent">
- 	  <implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="CalculatorServiceComponent_one">
-		<implementation.composite name="sample:dummyImplementation">
-		    <reference name="addService" target="AddServiceComponent" />
-		</implementation.composite>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
deleted file mode 100644
index 50d78cb2a6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="dummyImplementation">
-
-      <reference name="addService" target="AddServiceComponent" />
-	<reference name="addService" target="AddServiceComponent" />
-
-     <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-     </component> 
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
deleted file mode 100644
index bd788e47b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <property name="serviceName" type="xsd:anyURI">addService</property>
-        <property name="serviceName" type="xsd:anyURI">addMyService</property>
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
deleted file mode 100644
index 7281878c0f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index a37a01004e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.springframework.org/schema/sca/spring-sca.xsd">
-
-    <bean id="testBean" class="impl.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
deleted file mode 100644
index 08e18decc1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-	  <service name="AddService">
-		<binding.sca name="addBinding"/>
-		<binding.sca name="addBinding"/>
-	  </service>
-        <implementation.java class="calculator.warning.AddServiceImplWithServiceName"/>
-    </component>  
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImplWithServiceName"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
deleted file mode 100644
index 36e71e398b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ /dev/null
@@ -1,52 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-	  <implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="AddServiceComponent_one">
-    </component>    
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
deleted file mode 100644
index 9a46e09363..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ /dev/null
@@ -1,48 +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://www.osoa.org/xmlns/sca/1.0"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
deleted file mode 100644
index b3ed5f98ba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent">
-            <binding.sca/>
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-        <service name="AddService">
-            <binding.ws/>
-        </service>
-    </component>    
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
deleted file mode 100644
index 462a95dd02..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <reference name="promotedAddReference" promote="AddService/addService"/>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
deleted file mode 100644
index 4b6c44bd58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <service name="promotedAddService" promote="AddServiceComponent_one"/>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
deleted file mode 100644
index a397e3384c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-    <component name="PropertyServiceComponent">
-        <property name="firstName" type="xsd:anyURI" mustSupply="true">Simon</property>
-        <property name="lastName" type="xsd:anyURI">Laws</property>
-        <implementation.java class="calculator.warning.PropertyServiceImpl"/>
-    </component> 
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
deleted file mode 100644
index 08fab865fa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-    <component name="PropertyServiceComponent">
-        <implementation.java class="calculator.warning.PropertyServiceImpl"/>
-    </component> 
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
deleted file mode 100644
index 3a5f59b17c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-    <component name="PropertyServiceComponent">
-        <property name="lastName" type="xsd:anyURI" many="true">Laws</property>
-        <implementation.java class="calculator.warning.PropertyServiceImpl"/>
-    </component> 
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
deleted file mode 100644
index 8221e41430..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <property name="serviceName_one" type="xsd:anyURI">addService</property>
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
deleted file mode 100644
index 9c5ae7027f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent">
-		<interface.java interface="calculator.warning.SubtractService"/>
-	  </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
deleted file mode 100644
index 3c85ed32e2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="SubtractServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
deleted file mode 100644
index 2d1a1e01f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" multiplicity="1..n" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
deleted file mode 100644
index efb457ac9e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService_one" target="AddServiceComponent" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
deleted file mode 100644
index a5beaf4ec9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService"/>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
deleted file mode 100644
index 06c3eeeaca..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="AddServiceComponent_one">
-        <service name="AddService_one"/>
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component> 
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
deleted file mode 100644
index 821ce570c8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-	     xmlns:sca="http://sca"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>  
-
-    <component name="AddServiceComponent_one">
-        <implementation.composite name="sca:dummyImplementation.composite"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/XsdValidation/Calculator.composite
deleted file mode 100644
index 63ccaa9957..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <binding.ws/>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
deleted file mode 100644
index da565081f3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </components>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
deleted file mode 100644
index 6153d40c3d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl" requires="tuscany:logging"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
deleted file mode 100644
index a3eb60bf58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.port(CalculatorService/CalculatorPort)" requires="tuscany:logging"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
deleted file mode 100644
index 6233d47d8d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"

-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-	    <binding.ws/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
deleted file mode 100644
index 6a9af9e070..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-	  <implementation.java/>
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
deleted file mode 100644
index 49b26c78f8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-	  <interface.java/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
deleted file mode 100644
index c34a160b61..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://sample.calculator"
-	targetNamespace="http://calc"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator"/>
-        <binding.ws wsdli:wsdlLocation="http://tempuri.org" wsdlElement="http://sample/calculator#wsdl.binding(CalculatorBinding)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.port(CalculatorService/CalculatorPort)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.endpoint(CalculatorService/CalculatorEndpoint)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
deleted file mode 100644
index 293c4d725d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:calc="http://sample.calculator"
-    targetNamespace="http://calc"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    name="Calculator-bad-wsdlElement">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.port(CalculatorService/CalculatorPort)">
-            <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
-                <wsa:Address>http://localhost:8085/Calculator</wsa:Address>
-            </wsa:EndpointReference>
-        </binding.ws>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index b7ff1e304f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding2)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index 8cda0b007e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.service(HelloWorldService2)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
deleted file mode 100644
index 781319d619..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.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://www.osoa.org/xmlns/sca/1.0" name="account">
-
-    <!-- composite refrence with ejb binding. Modify host and port number in uri attribute based on where you have installed target ResumeBank EJB -->
-
-    <component name="CustomerComponent">
-        <implementation.java class="binding.ejb.account.CustomerImpl" />
-        <reference name="extEJBService">
-            <!-- To use the CosNaming, use the following URI -->
-            <!-- 
-                <binding.ejb uri="corbaname:iiop:1.2@localhost:1050#AddServiceBean" />
-            -->
-            <binding.ejb session-type="state" uri="hello-addservice/AddServiceBean/binding.ejb.calculator.AddService" />
-        </reference>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
deleted file mode 100644
index 8a0dfac98b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.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://www.osoa.org/xmlns/sca/1.0" name="account">
-
-    <!-- composite refrence with ejb binding. Modify host and port number in uri attribute based on where you have installed target ResumeBank EJB -->
-
-    <component name="CustomerComponent">
-        <implementation.java class="binding.ejb.account.CustomerImpl" />
-        <reference name="extEJBService">
-            <!-- To use the CosNaming, use the following URI -->
-            <!-- 
-                <binding.ejb uri="corbaname:iiop:1.2@localhost:1050#AddServiceBean" />
-            -->
-            <binding.ejb ejb-version="EJB4" uri="hello-addservice/AddServiceBean/binding.ejb.calculator.AddService" />
-        </reference>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
deleted file mode 100644
index fcfe408582..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-		   <activationSpec name="jms"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
deleted file mode 100644
index ede3b3fd40..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always" type="queue"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
deleted file mode 100644
index a8c89a0bf5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-               <headers JMSType="jms"/>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
deleted file mode 100644
index b4e56d1789..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">         
-               <resourceAdapter name="resAdpName"/>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
deleted file mode 100644
index e68eb75d64..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-			<activationSpec name="jms"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
deleted file mode 100644
index 00c7a3f86b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <connectionFactory name="RespQueueA"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
deleted file mode 100644
index d656d47cfd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always" type="queue"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
deleted file mode 100644
index ad1daacfcf..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms correlationScheme="correlationScheme" initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
deleted file mode 100644
index fb35f5d1b8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.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://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always" type="no"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
deleted file mode 100644
index fcdf25455c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <activationSpec name=""/>
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
deleted file mode 100644
index 14f1314a1b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <connectionFactory name=""/>
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
deleted file mode 100644
index 1a3cb21ac6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-			<activationSpec name=""/>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
deleted file mode 100644
index 80b8f9d938..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-			<connectionFactory name=""/>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
deleted file mode 100644
index 8fd1e2f554..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
-			jndiURL="tcp://localhost:61616" uri="tuscany://localhost:17171">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
deleted file mode 100644
index b74682e1bd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-               <resourceAdapter name="resource">
-                  <property name="resourceName" type="jms"/>
-               </resourceAdapter>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
deleted file mode 100644
index f439ab6260..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-                  <connectionFactory name="RespQueueA">
-                     <property name="RespQueueA"/>
-                  </connectionFactory>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
deleted file mode 100644
index e22f30152e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
-			jndiURL="tcp://localhost:61616" uri="jms://queue.sample?transport.jms=QueueConnectionFactory">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
deleted file mode 100644
index 6ef7558d95..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <export.java xmlns:ns="http://ns"/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
deleted file mode 100644
index 77a2715373..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <export xmlns:ns="http://ns"/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
deleted file mode 100644
index d7fa82635e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ /dev/null
@@ -1,55 +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://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <export.resource xmlns:ns="http://ns"/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
deleted file mode 100644
index 7f5eb546e0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable/>
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
deleted file mode 100644
index 0dfe52985a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hna:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
deleted file mode 100644
index d3f249720d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="{HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
deleted file mode 100644
index 575927a5de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld2"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
deleted file mode 100644
index 973d1f618a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    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="" />
-   </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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
deleted file mode 100644
index 5d2aeddc3d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ /dev/null
@@ -1,68 +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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca-bpel/200801"
-    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" 
-      sca:service="service" sca:reference="reference"/>
-   </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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
deleted file mode 100644
index 077df56290..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
deleted file mode 100644
index 68df3156a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld2.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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    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/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
deleted file mode 100644
index 695fd60887..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ /dev/null
@@ -1,80 +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:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index f3cf93ddaa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="impl.java.CalculatorServiceImpl_one"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="impl.java.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="impl.java.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="impl.java.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="impl.java.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
deleted file mode 100644
index f9016219a5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="impl.java.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="impl.java.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="impl.java.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="impl.java.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="impl.java.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
deleted file mode 100644
index 634c13b3cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="OSGiTestService">
-        <interface.java interface="impl.osgi.OSGiTestInterface"/>
-    </service>
-    
-    <property name="currency" type="xsd:string">GBP</property> 
-    <property name="exchangeRate" type="xsd:double">1.0</property> 
-    
-</componentType>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
deleted file mode 100644
index 0d1861f2f5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.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://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="OSGiTestComposite">
-
-    <component name="OSGiTestServiceComponent">
-        <tuscany:implementation.osgi 
-            bundle="OSGiTestService" 
-            bundleSymbolicName="impl.osgi.OSGiTestInterface"/>
-  
-        <property name="currency" type="xsd:string" >USD</property> 
-        <property name="exchangeRate" type="xsd:double" >2.0</property>            
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
deleted file mode 100644
index cf4f0a22aa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
deleted file mode 100644
index 0d1861f2f5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.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://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="OSGiTestComposite">
-
-    <component name="OSGiTestServiceComponent">
-        <tuscany:implementation.osgi 
-            bundle="OSGiTestService" 
-            bundleSymbolicName="impl.osgi.OSGiTestInterface"/>
-  
-        <property name="currency" type="xsd:string" >USD</property> 
-        <property name="exchangeRate" type="xsd:double" >2.0</property>            
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
deleted file mode 100644
index 634c13b3cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="OSGiTestService">
-        <interface.java interface="impl.osgi.OSGiTestInterface"/>
-    </service>
-    
-    <property name="currency" type="xsd:string">GBP</property> 
-    <property name="exchangeRate" type="xsd:double">1.0</property> 
-    
-</componentType>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
deleted file mode 100644
index ceb0930102..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
deleted file mode 100644
index 881c24854b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="OSGiTestComposite">
-
-    <component name="OSGiTestServiceComponent">
-        <tuscany:implementation.osgi 
-            bundle="OSGiTestService" 
-            bundleSymbolicName="impl.osgi.OSGiTestInterface">
-        <tuscany:properties name="osgiProperties"/>
-        </tuscany:implementation.osgi>
-  
-        <property name="currency" type="xsd:string" >USD</property> 
-        <property name="exchangeRate" type="xsd:double" >2.0</property>            
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
deleted file mode 100644
index 4e680f1200..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="ResourceServiceComponent">
-        <tuscany:implementation.resource location="contents"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
deleted file mode 100644
index e01643ed8f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="ResourceServiceComponent">
-        <tuscany:implementation.resource/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
deleted file mode 100644
index d776882ed0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0"
-           name="SpringHelloWorld">
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
deleted file mode 100644
index 0d1ffc97e4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ /dev/null
@@ -1,27 +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://www.osoa.org/xmlns/sca/1.0"
-           name="SpringHelloWorld">
-
-    <component name="HelloWorldComponent">
-        <implementation.spring/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ /dev/null
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
deleted file mode 100644
index 99c529d77f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="impl.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
deleted file mode 100644
index c75f209b6d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ /dev/null
@@ -1,27 +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">
-
-  <service name="CalculatorService">
-        <interface.java interface="impl.spring.HelloWorld" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
deleted file mode 100644
index a5874707da..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="store">
-        <tuscany:implementation.widget location="content/store.html"/>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
deleted file mode 100644
index 393b9fe674..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="store">
-        <tuscany:implementation.widget/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
deleted file mode 100644
index 1dca444938..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ /dev/null
@@ -1,28 +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://www.osoa.org/xmlns/sca/1.0"
-	     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="HelloWorld">
-
-    <component name="HelloWorldComponent">
-        <tuscany:implementation.xquery location="content/test.xquery"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
deleted file mode 100644
index 9a60183c5c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ /dev/null
@@ -1,28 +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://www.osoa.org/xmlns/sca/1.0"
-	     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="HelloWorld">
-
-    <component name="HelloWorldComponent">
-        <tuscany:implementation.xquery/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
deleted file mode 100644
index bc7bf3f250..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,27 +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">
-
-  <service name="CalculatorService">
-        <interface.java interface="calculator.warning.CalculatorService_one" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
deleted file mode 100644
index a1a699fc75..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="interfacejava.xml.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="interfacejava.xml.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
deleted file mode 100644
index 7446e4f06a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,27 +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">
-
-  <service name="CalculatorService">
-        <interface.java interface="interfacejava.xml.CalculatorService" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
deleted file mode 100644
index 0bbb10706e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ /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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://sample.calculator"
-	targetNamespace="http://calc"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator" wsdli:wsdlLocation="http://tempuri.org"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
deleted file mode 100644
index 9d9376ad6c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"
-            xmlns="http://www.w3.org/2001/XMLSchema" xmlns:g="http://greeting">
-
-            <!-- 
-                <import namespace="http://greeting" schemaLocation="../xsd/greeting.xsd" />
-            -->
-            <include schemaLocation="../xsd/helloworld.xsd" />
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="g:Name" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="g:Greeting" />
-                    </sequence>
-                </complexType>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
deleted file mode 100644
index 3885357625..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:import location="helloworld-interface.wsdl" namespace="http://helloworld"></wsdl:import>
-    <!-- 
-    <wsdl:import namespace="http://helloworld"></wsdl:import>
-     -->
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address
-                location="http://localhost:8085/sample-helloworldws-1.0-SNAPSHOT/services/HelloWorldWebService" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index d9252ba54f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld2)" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
deleted file mode 100644
index 53d1a581f0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ /dev/null
@@ -1,78 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <permitAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <allow roles="r1 r2" />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps3" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <denyAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps6" provides="authorization" appliesTo="sca:implementation">
-        <permitAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps7" provides="authorization" appliesTo="sca:implementation">
-        <allow roles="r1 r2" />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps8" provides="authorization" appliesTo="sca:implementation">
-        <denyAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps9" provides="securityIdentity" appliesTo="sca:implementation">
-        <runAs role="admin" />
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
deleted file mode 100644
index ac45d95ce8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ /dev/null
@@ -1,78 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <permitAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <allow/>
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps3" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <denyAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps6" provides="authorization" appliesTo="sca:implementation">
-        <permitAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps7" provides="authorization" appliesTo="sca:implementation">
-        <allow roles="r1 r2" />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps8" provides="authorization" appliesTo="sca:implementation">
-        <denyAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps9" provides="securityIdentity" appliesTo="sca:implementation">
-        <runAs role="admin" />
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
deleted file mode 100644
index 5cf6963a96..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ /dev/null
@@ -1,63 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent> 
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
deleted file mode 100644
index d31c705fb5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ /dev/null
@@ -1,76 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-                    
-<!-- qualified intents -->
- <intent name="confidentiality.transport" constrains="sca:binding"/>
- <intent name="confidentiality.message" />
- <intent name="confidentiality.message.whole" />
- <intent name="confidentiality.message.body" /> 
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent>
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
deleted file mode 100644
index d214a7f40a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ /dev/null
@@ -1,175 +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.    
--->
-<sca:definitions xmlns="http://test"
-            targetNamespace="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
- <!-- qualified intents -->
- <sca:intent name="confidentiality.transport" />
- <sca:intent name="confidentiality.message" />
- <sca:intent name="confidentiality.message.whole" />
- <sca:intent name="confidentiality.message.body" /> 
- 
- <!-- POLICY SETS -->
-  <sca:policySet name="SecureReliablePolicy"
-    provides="confidentiality.transport integrity"
-    appliesTo="//sca:binding.ws | //sca:binding.sca"
-    xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                 "basic authentication" -->
-        </wsp:PolicyAttachment>
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                "reliability" -->
-        </wsp:PolicyAttachment>
- </sca:policySet>
- 
- <sca:policySet name="SecureMessagingPolicies"
-     provides="confidentiality"
-     appliesTo="//sca:binding.ws"
-     xmlns="http://test"
-     xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-     <sca:intentMap provides="confidentiality_one" default="transport">
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:Policy>
-            <wsp:Policy>...</wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="message">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "message" alternative" -->
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="SecurityPolicy" provides="confidentiality"
-    xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
-    <sca:intentMap provides="confidentiality" default="message">
-        <sca:qualifier name="message">
-            <sca:intentMap provides="message" default="whole">
-                <sca:qualifier name="body">
-                    <wsp:Policy>
-                        <!-- policy attachment for body encryption --> 
-                    </wsp:Policy>
-                </sca:qualifier>
-                <sca:qualifier name="whole">
-                    <wsp:Policy>
-                        <!-- policy attachment for whole message encryption --> 
-                    </wsp:Policy>
-                </sca:qualifier>
-            </sca:intentMap>
-        </sca:qualifier>
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy attachment for transport encryption --> 
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="BasicAuthMsgProtSecurity"
-     provides="authentication confidentiality"
-     appliesTo="//sca:binding.ws"
-        xmlns="http://test">
-    <sca:policySetReference name="AuthenticationPolicies"/>
-    <sca:policySetReference name="ConfidentialityPolicies"/>
-</sca:policySet>
-
-<sca:policySet name="AuthenticationPolicies"
-    provides="authentication"
-    appliesTo="//sca:binding.ws"
-    xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <wsp:PolicyAttachment>
-        <!-- policy expression and policy subject for "basic
-        authentication" -->
-    </wsp:PolicyAttachment>
-</sca:policySet>
-
-<sca:policySet name="ConfidentialityPolicies"
- provides="confidentiality"
- bindings="binding.ws"
- xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <sca:intentMap provides="confidentiality"  default="transport">
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "transport"
-                alternative -->
-            </wsp:Policy>
-            <wsp:Policy>...</wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="message">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "message"
-                alternative" -->...
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<!-- profile intent -->
- <sca:intent name="reliableMessageProtection" 
-             constrains="sca:binding"
-             requires="messageProtection">
-             <sca:description>
-                Protect messages from unauthorized reading or modification
-             </sca:description>
- </sca:intent>
- 
- <sca:intent name="messageProtection" 
-             constrains="sca:binding"
-             requires="confidentiality integrity">
-             <sca:description>
-                Protect messages from unauthorized reading or modification
-             </sca:description>
- </sca:intent>
-
-<!-- simple intent -->
- <sca:intent name="confidentiality" 
-             constrains="sca:binding">
-             <sca:description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </sca:description>
- </sca:intent>
- 
- <sca:intent name="integrity" 
-             constrains="sca:binding">
-             <sca:description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </sca:description>
- </sca:intent>
- 
- <sca:intent name="authentication" 
-             constrains="sca:binding">
-             <sca:description>
-             Communitcation thro this binding required
-             Authentication.
-             </sca:description>
- </sca:intent>
- 
-</sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
deleted file mode 100644
index ede1786942..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ /dev/null
@@ -1,63 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
deleted file mode 100644
index fcb43c949b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ /dev/null
@@ -1,70 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent> 
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
deleted file mode 100644
index 14eefadaba..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ /dev/null
@@ -1,240 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:calc="http://calculator">
-    
-    <!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-					mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-					mayProvide="test:integrity"/>
-
-    <!-- PolicySets -->
-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <tuscany:jdkLogger name="calculator">
-            <logLevel>FINER</logLevel>
-        </tuscany:jdkLogger>
-    </policySet>
-    
-    <!-- Intents and Policysets to assume targetnamespace -->									
-<intent name="TestIntentOne" 
- 			 constrains="sca:binding"
- 			 >
- 			 <description>
- 			 	Test Intent
- 			 </description>
- </intent>
- 
-  <intent name="TestIntentTwo" 
- 			 constrains="sca:binding"
- 			 requires="TestIntentOne">
- 			 <description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </description>
- </intent>
- 
- <policySet name="TestPolicySetOne"
- 	provides="test:TestIntentOne"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 		<wsp:PolicyAttachment>
- 			<!-- policy expression and policy subject for
-				 "basic authentication" -->
-		</wsp:PolicyAttachment>
-     	<wsp:PolicyAttachment>
-		 	<!-- policy expression and policy subject for
-		 		"reliability" -->
-		</wsp:PolicyAttachment>
- </policySet>
- 
- 
- <!-- qualified intents -->
- <intent name="confidentiality.transport" />
- <intent name="confidentiality.message" />
- <intent name="confidentiality.message.whole" />
- <intent name="confidentiality.message.body" /> 
- 
- <!-- POLICY SETS -->
-  <policySet name="SecureReliablePolicy"
- 	provides="test:confidentiality.transport test:integrity"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 		<wsp:PolicyAttachment>
- 			<!-- policy expression and policy subject for
-				 "basic authentication" -->
-		</wsp:PolicyAttachment>
-     	<wsp:PolicyAttachment>
-		 	<!-- policy expression and policy subject for
-		 		"reliability" -->
-		</wsp:PolicyAttachment>
- </policySet>
-
-<policySet name="SecurityPolicy" provides="test:confidentiality"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
-    <intentMap provides="test:confidentiality" default="message">
-        <qualifier name="message">
-            <intentMap provides="message" default="whole">
-                <qualifier name="body">
-                	<wsp:PolicyAttachment>
-                		<!-- policy attachment for body encryption --> 
-               		</wsp:PolicyAttachment>
-           		</qualifier>
-                <qualifier name="whole">
-                	<wsp:PolicyAttachment>
-                		<!-- policy attachment for whole message encryption --> 
-               		</wsp:PolicyAttachment>
-             	</qualifier>
-            </intentMap>
-        </qualifier>
-        <qualifier name="transport">
-        	<wsp:PolicyAttachment>
-        		<!-- policy attachment for transport encryption --> 
-       		</wsp:PolicyAttachment>
-        </qualifier>
-    </intentMap>
-</policySet>
-
-<policySet name="BasicAuthMsgProtSecurity"
-     provides="test:authentication test:confidentiality"
-     appliesTo="binding.ws"
- 		xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <policySetReference name="test:AuthenticationPolicies"/>
-    <policySetReference name="test:ConfidentialityPolicies"/>
-</policySet>
-
-<policySet name="AuthenticationPolicies"
-	provides="test:authentication"
-	appliesTo="binding.ws"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <wsp:PolicyAttachment>
-        <!-- policy expression and policy subject for "basic
-        authentication" -->
-    </wsp:PolicyAttachment>
-</policySet>
-
-<policySet name="ConfidentialityPolicies"
- provides="test:confidentiality"
- bindings="binding.ws"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <intentMap provides="test:confidentiality"  default="transport">
-        <qualifier name="transport">
-            <wsp:PolicyAttachment>
-                <!-- policy expression and policy subject for "transport"
-                alternative -->
-            </wsp:PolicyAttachment>
-            <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-        </qualifier>
-        <qualifier name="message">
-            <wsp:PolicyAttachment>
-                <!-- policy expression and policy subject for "message"
-                alternative" -->...
-            </wsp:PolicyAttachment>
-        </qualifier>
-    </intentMap>
-</policySet>
-
-<policySet name="SecureWSPolicy"
- 	provides="test:confidentiality"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:Policy>
-	    <wsp:ExactlyOne>
-	      <wsp:All>
-	        <sp:SecurityToken>
-	          <sp:TokenType>sp:X509v3</sp:TokenType>
-	        </sp:SecurityToken>
-	        <sp:UsernameToken /> 
-	        <sp:SignedParts />
-	        <sp:EncryptedParts>
-	          <sp:Body />
-	        </sp:EncryptedParts>
-	        <sp:TransportBinding>
-	          <sp:IncludeTimeStamp />
-	        </sp:TransportBinding>
-	      </wsp:All>
-	    </wsp:ExactlyOne>
-  </wsp:Policy>
- </policySet>
-
-<!-- profile intent -->
- <intent name="reliableMessageProtection" 
- 			 constrains="sca:binding"
- 			 requires="test:messageProtection">
- 			 <description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </description>
- </intent>
- 
- <intent name="messageProtection" 
- 			 constrains="sca:binding"
- 			 requires="test:confidentiality test:integrity">
- 			 <description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </description>
- </intent>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
- 			 constrains="sca:binding">
- 			 <description>
- 			 Communitcation thro this binding must prevent
- 			 unauthorized users from reading the messages.
- 			 </description>
- </intent>
- 
- <intent name="integrity" 
- 			 constrains="sca:binding">
- 			 <description>
- 			 Communitcation thro this binding must prevent
- 			 unauthorized modification of the messages.
- 			 </description>
- </intent>
- 
- <intent name="authentication" 
- 			 constrains="sca:binding">
- 			 <description>
- 			 Communitcation thro this binding required
- 			 Authentication.
- 			 </description>
- </intent>
- 
- <intent name="logging" 
- 			 constrains="sca:implementation">
- 			 <description>
- 			 	All messages to and from this implementation must be logged
- 			 </description>
- </intent>
- 
- <intent name="tracing" 
- 			 constrains="sca:implementation.java">
- 			 <description>
- 			 	Need to figure out some description for this 
- 			 </description>
- </intent>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
deleted file mode 100644
index 60f4de5cd3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ /dev/null
@@ -1,68 +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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:interface.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent>
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
deleted file mode 100644
index 9b0d51eb59..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ /dev/null
@@ -1,61 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionReadException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/ContributionReadException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/ContributionReadException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ContributionReadException", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
deleted file mode 100644
index e8476991a9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ /dev/null
@@ -1,61 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PolicyImplValidationException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/PolicyImplValidationException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyImplValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
deleted file mode 100644
index 8ae156d63e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ /dev/null
@@ -1,61 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PolicyServiceValidationException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/PolicyServiceValidationException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyServiceValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
deleted file mode 100644
index d757ff98dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ /dev/null
@@ -1,61 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedBindingElement extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedBindingElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedBindingElement", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
deleted file mode 100644
index 9a231a18c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ /dev/null
@@ -1,61 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedImplementationElement extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedImplementationElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedImplementationElement", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
deleted file mode 100644
index 4ae88b9ba3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedInterfaceElement extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedInterfaceElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
deleted file mode 100644
index 1cef8a902e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ /dev/null
@@ -1,63 +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 binding.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownEJBSessionTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-    	System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:8085");
-        System.setProperty("managed", "false");  
-        
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBSessionType/account.composite", 
-        			"TestContribution", "src/main/resources/bindingejb/UnknownEJBSessionType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownEJBSessionType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
deleted file mode 100644
index bacddc93a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ /dev/null
@@ -1,63 +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 binding.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownEJBVersionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception {
-    	System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:8085");
-        System.setProperty("managed", "false");
-        
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBVersion/account.composite", 
-        			"TestContribution", "src/main/resources/bindingejb/UnknownEJBVersion/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownEJBVersion", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
deleted file mode 100644
index e0e5347d96..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessActivationSpecTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/DoesntProcessActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
deleted file mode 100644
index 9e08afec09..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessDestinationTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
deleted file mode 100644
index bae9656433..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessHeadersTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessHeaders/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessHeaders/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessHeaders", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
deleted file mode 100644
index a2a5b0b872..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResourceAdapterTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResourceAdapter/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResourceAdapter", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
deleted file mode 100644
index 64b41623de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseActivationSpecTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite", 
-                       "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 86fbe51dad..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseConnectionFactoryTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
deleted file mode 100644
index 6e884c41cd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseDestinationTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
deleted file mode 100644
index c237f8af18..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidCorrelationSchemeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/InvalidCorrelationScheme/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidCorrelationScheme", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
deleted file mode 100644
index 949ec02134..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidResponseDestinationTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/InvalidResponseDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
deleted file mode 100644
index a974ef0db4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingActivationSpecNameTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingActivationSpecName/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingActivationSpecName/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingActivationSpecName", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
deleted file mode 100644
index adbaa50dc0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingConnectionFactoryNameTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingConnectionFactoryName/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingConnectionFactoryName", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
deleted file mode 100644
index 4bba6b74de..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingResponseActivationSpecTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingResponseActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 8f4fc1a739..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingResponseConnectionFactoryTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingResponseConnectionFactory/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
deleted file mode 100644
index d9e1c782a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MustStartWithSchemaTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MustStartWithSchema/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MustStartWithSchema/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustStartWithSchema", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
deleted file mode 100644
index 3e4e36d839..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedElementTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/UnexpectedElement/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/UnexpectedElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedElement", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
deleted file mode 100644
index 60ea47a85f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedResponseElementTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/UnexpectedResponseElement/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/UnexpectedResponseElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedResponseElement", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
deleted file mode 100644
index 6a75a35f99..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownTokenInURITestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/UnknownTokenInURI/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/UnknownTokenInURI/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownTokenInURI", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
deleted file mode 100644
index c0f60a848f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ /dev/null
@@ -1,61 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidWsdlElementAttrTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite", 
-        			"TestContribution", "src/main/resources/binding/wsxml/InvalidWsdlElementAttr/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
deleted file mode 100644
index 5a74194796..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ /dev/null
@@ -1,61 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MustUseWsdlBindingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite", 
-        			"TestContribution", "src/main/resources/binding/wsxml/MustUseWsdlBinding/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustUseWsdlBinding", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
deleted file mode 100644
index 7991de7176..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,61 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlBindingDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
deleted file mode 100644
index a0a7d12b9f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,61 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlServiceDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
deleted file mode 100644
index 84c77ae297..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ /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.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ComponentReferenceTargetNotFound").toURL().toString()));
-        
-        try {
-            node.start();
-        } catch (Exception ex){
-            // do nothing - the SCA binding throws and exception here 
-            // because the interface for the reference is not remotable
-        }
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
deleted file mode 100644
index ff1bd6cb09..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ /dev/null
@@ -1,74 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateComponentNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateComponentName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateComponentName").toURL().toString()));
-        /*
-        node = SCANode2Factory.createSCANodeWithComposite("DuplicateComponentName/Calculator.composite");
-        */
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
deleted file mode 100644
index 65dab38ee3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ /dev/null
@@ -1,65 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationPropertyNameTestCase extends TestCase {
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateImplementationPropertyName").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
deleted file mode 100644
index 6c10d1279c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ /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.    
- */
-package calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationReferenceNameTestCase extends TestCase {
-
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateImplementationReferenceName").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
deleted file mode 100644
index 4531564ccb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicatePropertyNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicatePropertyName").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
deleted file mode 100644
index 3b024c58c7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateReferenceNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateReferenceName").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
deleted file mode 100644
index 4f54b023f4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MultipleBindingsForServiceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/MultipleBindingsForService").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("MultipleBindingsForService", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
deleted file mode 100644
index 14af754860..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ /dev/null
@@ -1,67 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoComponentImplementationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/NoComponentImplementation").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
deleted file mode 100644
index 2f2e87f9af..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoCompositeNamespaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoCompositeNamespace/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/NoCompositeNamespace").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoCompositeNamespace", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
deleted file mode 100644
index eb1f514240..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ /dev/null
@@ -1,74 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoMatchingBindingTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        try {
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/NoMatchingBinding/Calculator.composite").toURL().toString(),
-            		                 new SCAContribution("TestContribution", 
-            		                                     new File("src/main/resources/NoMatchingBinding").toURL().toString()));
-    
-            node.start();
-            calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        } catch (Exception ex){
-            // do nothing
-            return;
-        }
-        Assert.fail();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        /*
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoMatchingBinding", problem.getMessageId());
-        */
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
deleted file mode 100644
index 07c75decbc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PromotedReferenceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
deleted file mode 100644
index 26c988c1c1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PromotedServiceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedServiceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedServiceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedServiceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
deleted file mode 100644
index 3753fc278c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyAttributeMustSupplyNullTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyNull", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
deleted file mode 100644
index 08e5a9861b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyAttributeTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
deleted file mode 100644
index 4af2675c09..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
deleted file mode 100644
index 11fde0a73d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyOverrideManyAttributeTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyOverrideManyAttribute", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
deleted file mode 100644
index 19b04e6940..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleComponentInterfaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleComponentInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
deleted file mode 100644
index 3180539898..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleInterfaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
deleted file mode 100644
index 87ae0f0e3c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleMultiplicityTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleMultiplicity").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
deleted file mode 100644
index 4856ba507f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
deleted file mode 100644
index f456ae40af..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceWithoutTargetsTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceWithoutTargets/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceWithoutTargets").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceWithoutTargets", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
deleted file mode 100644
index 51adc22848..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ServiceNotFoundForComponentServiceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ServiceNotFoundForComponentService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ServiceNotFoundForComponentService").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ServiceNotFoundForComponentService", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
deleted file mode 100644
index 918108c275..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ /dev/null
@@ -1,67 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnresolvedComponentImplementationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/UnresolvedComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/UnresolvedComponentImplementation").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnresolvedComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
deleted file mode 100644
index 93edfa2e21..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ /dev/null
@@ -1,67 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class XSDValidationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-    private Exception startUpException;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            node = nodeFactory.createSCANode(new File("src/main/resources/XsdValidation/Calculator.composite").toURL().toString(),
-            		                 new SCAContribution("TestContribution", 
-            		                                     new File("src/main/resources/XsdValidation").toURL().toString()));
-            node.start();
-            calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        } catch (Exception ex){
-            startUpException = ex;
-        }        
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (node != null){
-            node.stop();
-        }
-    }
-
-
-    public void testCalculator() throws Exception {
-        
-        assertEquals("org.osoa.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
-   
-    }
- 
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
deleted file mode 100644
index 04135ab2cc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ /dev/null
@@ -1,61 +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 contribution.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributePackageMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/java/AttributePackageMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
deleted file mode 100644
index ab0afc6f65..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ /dev/null
@@ -1,61 +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 contribution.namespace;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeNameSpaceMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/namespace/AttributeNameSpaceMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
deleted file mode 100644
index a1b42bf815..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ /dev/null
@@ -1,61 +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 contribution.resource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeURIMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/resource/AttributeURIMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
deleted file mode 100644
index 32c1a8b3a8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ /dev/null
@@ -1,61 +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 contribution.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeCompositeMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/xml/AttributeCompositeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeCompositeMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
deleted file mode 100644
index 9ad5407ed6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ /dev/null
@@ -1,207 +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 domain;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-public class CustomCompositeBuilder {
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private ModelResolverExtensionPoint modelResolvers;
-    private ModelFactoryExtensionPoint modelFactories;
-    private WorkspaceFactory workspaceFactory;
-    private AssemblyFactory assemblyFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> xmlProcessor; 
-    private ContributionDependencyBuilder contributionDependencyBuilder;
-    private CompositeBuilder domainCompositeBuilder;
-    private CompositeBuilder nodeCompositeBuilder;
-    private NodeImplementationFactory nodeFactory;
-    //private AtomBindingFactory atomBindingFactory;
-    private static Workspace workspace;
-    private List<SCADefinitions> policyDefinitions;
-    private Monitor monitor;
-        
-    private CustomCompositeBuilder() {
-        // no code req'd
-    }
-
-    public static CustomCompositeBuilder getInstance()
-    {
-      if (ref == null)
-          ref = new CustomCompositeBuilder();
-      return ref;
-    }
-
-    private static CustomCompositeBuilder ref;
-    
-    private void init() {
-        
-    	// Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-        
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);       
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        //atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper, null, monitor);
-    }
-    
-    public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
-    	init();
-
-        // Create workspace model
-        workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI artifactURI = URI.create(sourceURI);
-        //URL contributionURL = FileHelper.toFile(new URL(sourceURL)).toURI().toURL();
-        URL artifactURL = new File(sourceURL).toURI().toURL();
-        URL contributionURL = new File(compositeURL).toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);              	
-        workspace.getContributions().add(storeContribution);
-        
-        // Build the contribution dependencies
-        Map<Contribution, List<Contribution>> contributionDependencies = new HashMap<Contribution, List<Contribution>>();
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                   	contributionProcessor.resolve(dependency, workspace.getModelResolver());                                       
-                }
-            }
-            
-            contributionDependencies.put(contribution, dependencies);
-        }
-        
-        // Create a composite model for the domain
-        /*Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);*/
-    }
-    
-    public Monitor getMonitorInstance() {
-    	return monitor;
-    }
-    
-    public void readContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
-    	init();
-
-        // Create workspace model
-        workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI artifactURI = URI.create(sourceURI);
-        //URL contributionURL = FileHelper.toFile(new URL(sourceURL)).toURI().toURL();
-        URL artifactURL = new File(sourceURL).toURI().toURL();
-        URL contributionURL = new File(compositeURL).toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);              	
-        workspace.getContributions().add(storeContribution);    	
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
deleted file mode 100644
index 9d97e3611a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeUnrecognizedNamespaceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
deleted file mode 100644
index 80c15dc444..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeWithoutNamespaceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/AttributeWithoutNamespace/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeWithoutNamespace", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
deleted file mode 100644
index 81e8aecfeb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class BPELProcessNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/BPELProcessNotFound/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("BPELProcessNotFound", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
deleted file mode 100644
index fb0c525aea..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CannotResolveWSDLReferenceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/CannotResolveWSDLReference/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CannotResolveWSDLReference", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
deleted file mode 100644
index 445629457e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MyRolePartnerRoleNullTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/MyRolePartnerRoleNull/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
deleted file mode 100644
index 00b904ae65..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkHasBothAttrTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkHasBothAttr/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
-    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
deleted file mode 100644
index b7a4ee6fef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkNoMatchingTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkNoMatchingType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
deleted file mode 100644
index 32d3211f36..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkTypeNoRolesTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
-    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
-        
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
deleted file mode 100644
index 3a7745722a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.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 impl.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ClassNotFoundExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/java/ClassNotFoundException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/impl/java/ClassNotFoundException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 59fc3ce79c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,61 +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 impl.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/java/ContributionResolveException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/impl/java/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	
-    	assertNotNull(problem);
-        assertEquals("ContributionResolveException", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
deleted file mode 100644
index 6f54ad140c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
+++ /dev/null
@@ -1,64 +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 impl.osgi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotLocateOSGiBundleTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        //OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-       OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
deleted file mode 100644
index 3d75fa8ccc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
+++ /dev/null
@@ -1,64 +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 impl.osgi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingComponentTypeFileTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/MissingComponentTypeFile/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    	OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MissingComponentTypeFile", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
deleted file mode 100644
index 398c028dd8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
+++ /dev/null
@@ -1,111 +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 impl.osgi;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-
-/**
- * 
- * Utility class to create OSGi bundles
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestBundles {
-    
-    public static void createBundle(String jarName,
-            Class<?> interfaceClass, Class<?> implClass) throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-        
-        String packageName = interfaceClass.getPackage().getName();
-        String bundleName = interfaceClass.getName();
-
-        String manifestStr = "Manifest-Version: 1.0" + EOL
-                + "Bundle-ManifestVersion: 2" + EOL + "Bundle-Name: "
-                + bundleName + EOL + "Bundle-SymbolicName: " + bundleName + EOL
-                + "Bundle-Version: " + "1.0.0" + EOL
-                + "Bundle-Localization: plugin" + EOL;
-
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + packageName + EOL);
-        manifestBuf.append("Import-Package: org.osgi.framework" + EOL);
-        manifestBuf.append("Bundle-Activator: " + implClass.getName() + EOL);
-
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-        
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        String interfaceClassName = interfaceClass.getName().replaceAll("\\.",
-                "/")
-                + ".class";
-
-        URL url = interfaceClass.getClassLoader().getResource(
-                interfaceClassName);
-        String path = url.getPath();
-
-        ZipEntry ze = new ZipEntry(interfaceClassName);
-
-        jarOut.putNextEntry(ze);
-        FileInputStream file = new FileInputStream(path);
-        byte[] fileContents = new byte[file.available()];
-        file.read(fileContents);
-        jarOut.write(fileContents);
-        
-        String implClassName = implClass.getName().replaceAll("\\.",
-                "/")
-                + ".class";
-
-        url = implClass.getClassLoader().getResource(implClassName);
-        path = url.getPath();
-
-        ze = new ZipEntry(implClassName);
-
-        jarOut.putNextEntry(ze);
-        file = new FileInputStream(path);
-        fileContents = new byte[file.available()];
-        file.read(fileContents);
-        jarOut.write(fileContents);
-
-        file.close();
-
-        jarOut.close();
-        out.close();
-
-        FileOutputStream fileOut = new FileOutputStream(jarName);
-        fileOut.write(out.toByteArray());
-        fileOut.close();
-
-
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
deleted file mode 100644
index 117a94337a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
+++ /dev/null
@@ -1,64 +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 impl.osgi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyShouldSpecifySRTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        OSGiTestBundles.createBundle("src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/PropertyShouldSpecifySR/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    	OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("PropertyShouldSpecifySR", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index 14ba8e992e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.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 impl.resource;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotResolveLocationTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite", 
-                      "TestContribution", "src/main/resources/impl/resource/CouldNotResolveLocation/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 461895f824..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.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 impl.resource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/resource/LocationAttributeMissing/resource.composite", 
-                      "TestContribution", "src/main/resources/impl/resource/LocationAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 9b7dbef3dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,57 +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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();        
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
deleted file mode 100644
index cd38b53f66..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/LocationAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
deleted file mode 100644
index 83550ae58d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnableToResolveComponentTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/UnableToResolveComponentType/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("UnableToResolveComponentType", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index d098bb4bf8..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.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 impl.widget;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotResolveLocationTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite", 
-                      "TestContribution", "src/main/resources/impl/widget/CouldNotResolveLocation/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 2f85d8ed4a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.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 impl.widget;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/widget/LocationAttributeMissing/widget.composite", 
-                      "TestContribution", "src/main/resources/impl/widget/LocationAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
deleted file mode 100644
index f90fc3b83f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.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 impl.xquery;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotLocateFileTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/xquery/CouldNotLocateFile/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CouldNotLocateFile", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 01450a8836..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.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 impl.xquery;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/xquery/LocationAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
deleted file mode 100644
index a03e056298..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.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 interfacejava.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ClassNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacejava/xml/ClassNotFoundException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index e0524f57b7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.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 interfacejava.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacejava/xml/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
deleted file mode 100644
index e212477c61..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.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 interfacewsdl.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidWSDLInterfaceAttrTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
deleted file mode 100644
index df2a2671df..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.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 interfacewsdl.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlInterfaceDoesNotMatchTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
deleted file mode 100644
index 361e2f2bfb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AlwaysProvidedIntentNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite", 
-        			"TestContribution", "src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
deleted file mode 100644
index a85dc334f4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ErrorInPolicyIntentDefinitionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite", 
-        			"TestContribution", "src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
deleted file mode 100644
index 3f98757ce5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class IntentNotSpecifiedTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite", 
-                       "TestContribution", "src/main/resources/policy/xml/IntentNotSpecified/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
-       /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); 
-       assertNotNull(problem);
-       assertEquals("IntentNotSpecified", problem.getMessageId());*/  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
deleted file mode 100644
index 3b8d075165..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MayProvideIntentNotFoundTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite", 
-                       "TestContribution", "src/main/resources/policy/xml/MayProvideIntentNotFound/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MayProvideIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
deleted file mode 100644
index bcf1f82392..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class RequiredAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-              customDomain.loadContribution("src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite", 
-                        "TestContribution", "src/main/resources/policy/xml/RequiredAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-       assertNotNull(problem);
-       assertEquals("RequiredAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
deleted file mode 100644
index 2a767d3550..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnableToMapPoliciesTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-            customDomain.loadContribution("src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite", 
-                      "TestContribution", "src/main/resources/policy/xml/UnableToMapPolicies/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("UnableToMapPolicies"));
-        /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-        assertNotNull(problem);
-        assertEquals("UnableToMapPolicies", problem.getMessageId());*/  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
deleted file mode 100644
index eec39d711e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnrecognizedIntentAttachPointTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-            customDomain.loadContribution("src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite", 
-                      "TestContribution", "src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wasAdmin.py b/tags/java/sca/1.3-RC1a/itest/wasAdmin.py
deleted file mode 100644
index 2be2b1eff7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wasAdmin.py
+++ /dev/null
@@ -1,91 +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.    
-"""
-import sys
-
-def getCellName():
-    """Return the name of the cell connected to"""
-    return AdminControl.getCell()
-
-def getNodeName():
-    """Return the name of the node connected to"""
-    return AdminControl.getNode()
-
-def startApplicationOnServer(appName,serverName):
-    """Start the named application on one server"""
-    print "startApplicationOnServer: Entry. appname=%s servername=%s" % ( appName,serverName )
-    cellName = getCellName()
-    nodeName = getNodeName()
-    # Get the application manager 
-    appManager = AdminControl.queryNames('cell=%s,node=%s,type=ApplicationManager,process=%s,*' %(cellName,nodeName,serverName))
-    print "startApplicationOnServer: appManager=%s" % ( repr(appManager) )
-    # start it
-    rc = AdminControl.invoke(appManager, 'startApplication', appName)
-    print "startApplicationOnServer: Exit. rc=%s" % ( repr(rc) )
-
-def stopApplicationOnServer(appName,serverName):
-    """Stop the named application on one server"""
-    print "stopApplicationOnServer: Entry. appname=%s servername=%s" % ( appName,serverName )
-    cellName = getCellName()
-    nodeName = getNodeName()
-    # Get the application manager 
-    appManager = AdminControl.queryNames('cell=%s,node=%s,type=ApplicationManager,process=%s,*' %(cellName,nodeName,serverName))
-    print "stopApplicationOnServer: appManager=%s" % ( repr(appManager) )
-    # start it
-    rc = AdminControl.invoke(appManager, 'stopApplication', appName)
-    print "stopApplicationOnServer: Exit. rc=%s" % ( repr(rc) )
-
-def installApplicationOnServer( fileName, appName, contextRoot, serverName ):
-    """Install given application on the named server using given context root"""
-    print "installApplicationOnServer: fileName=%s appName=%s contextRoot=%s ServerName=%s" % ( fileName, appName,contextRoot,serverName )
-    AdminApp.install(fileName,'[-appname ' + appName + ' -contextroot ' + contextRoot  + ' -server ' + serverName + ' -usedefaultbindings ]')
-    AdminConfig.save()
-    """modify classloader model for application"""
-    deploymentID = AdminConfig.getid('/Deployment:' + appName + '/')
-    deploymentObject = AdminConfig.showAttribute(deploymentID, 'deployedObject')
-    classldr = AdminConfig.showAttribute(deploymentObject, 'classloader')
-    print AdminConfig.showall(classldr)
-    AdminConfig.modify(classldr, [['mode', 'PARENT_LAST']])
-    """Modify WAR class loader model"""
-    AdminConfig.show(deploymentObject, 'warClassLoaderPolicy')
-    AdminConfig.modify(deploymentObject, [['warClassLoaderPolicy', 'SINGLE']])
-    AdminConfig.save()
-
-def uninstallApplicationOnServer( appName ):
-    """Delete the named application from the cell"""
-    AdminApp.uninstall( appName )
-    AdminConfig.save()
-
-
-
-"""-----------------------------------------------------------
-   Phyton script to interface with WAS Admin/Management Tools
------------------------------------------------------------"""
-
-if len(sys.argv) < 1:
-    print "wasAdmin.py : need parameters : functionName [args]"
-    sys.exit(0)
-if(sys.argv[0] == 'installApplicationOnServer'):
-    installApplicationOnServer(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
-elif(sys.argv[0] == 'startApplicationOnServer'):
-    startApplicationOnServer(sys.argv[1], sys.argv[2])
-elif(sys.argv[0] == 'uninstallApplicationOnServer'):
-    uninstallApplicationOnServer(sys.argv[1])
-else:
-    print "Exiting without doing anything"
-
diff --git a/tags/java/sca/1.3-RC1a/itest/wires/pom.xml b/tags/java/sca/1.3-RC1a/itest/wires/pom.xml
deleted file mode 100644
index 8d41197043..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/pom.xml
+++ /dev/null
@@ -1,45 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wires</artifactId>
-    <name>Apache Tuscany SCA Wires Basic Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
deleted file mode 100644
index 09d5b0278e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ /dev/null
@@ -1,34 +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.itest;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the client interface for the wires tests 
- */
-@Remotable
-public interface WireClient {
-
-    /**
-     * This tests the wires.
-     */
-    void runTests();
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
deleted file mode 100644
index f0964ebb93..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ /dev/null
@@ -1,52 +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.itest;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the client implementation for the wires tests 
- */
-@Service(WireClient.class)
-public class WireClientImpl implements WireClient {
-    /**
-     * This is our injected reference to the WireService
-     */
-    @Reference
-    protected WireService aWireService;
-
-    /**
-     * This tests the wire reference
-     */
-    public void runTests() {
-        // Make sure the wire has injected a reference
-        Assert.assertNotNull(aWireService);
-        
-        // Test the injected reference
-        String msg = aWireService.sayHello("MCC");
-        
-        // Validate the response
-        Assert.assertNotNull(msg);
-        Assert.assertEquals("Hello MCC", msg);
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
deleted file mode 100644
index c19a0b4f74..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.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 org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Sample Wire Service 
- */
-@Remotable
-public interface WireService {
-    /**
-     * Returns "Hello " + aName
-     * 
-     * @param aName The name to say hello
-     * @return "Hello " + aName
-     */
-    String sayHello(String aName);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
deleted file mode 100644
index b7ccdbf8d1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.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 org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * Sample WireService Implementation 
- */
-@Service(WireService.class)
-public class WireServiceImpl implements WireService {
-
-    /**
-     * Returns "Hello " + aName
-     * 
-     * @param aName The name to say hello
-     * @return "Hello " + aName
-     */
-    public String sayHello(String aName) {
-        return "Hello " + aName;
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wires/src/main/resources/WireTest.composite b/tags/java/sca/1.3-RC1a/itest/wires/src/main/resources/WireTest.composite
deleted file mode 100644
index 8b764d0e7d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/src/main/resources/WireTest.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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://wires" name="WireTest">

-

-    <component name="WireClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>

-<!-- We are not using a reference - we are using a wire - see below -->

-<!-- The equivalent reference for the wire would be as follows -->

-<!--    <reference name="aWireService" target="WireService"/>-->

-    </component> 

-    

-    <component name="AnotherWireClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>

-    </component> 

-    

-    <component name="WireServiceComponent">

-      <implementation.java class="org.apache.tuscany.sca.itest.WireServiceImpl"/>

-    </component>  

-  

-    <wire source="WireClient/aWireService" target="WireServiceComponent"/>

-    <wire source="AnotherWireClient/aWireService" target="WireServiceComponent/WireService"/>

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/tags/java/sca/1.3-RC1a/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
deleted file mode 100644
index 95f721cd8e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ /dev/null
@@ -1,69 +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.itest;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This test case will attempt to use a wire
- */
-public class WireTestCase extends TestCase {
-
-    /**
-     * The SCADomain we are using 
-     */
-    private SCADomain domain;
-    
-    /**
-     * The client the tests should use
-     */
-    private WireClient aWireClient;
-
-    /**
-     * Run the wire tests
-     */
-    public void testWire() {
-        aWireClient.runTests(); 
-    }
-
-    /**
-     * Load the Wire composite and look up the client.
-     */
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("WireTest.composite");
-        aWireClient = domain.getService(WireClient.class, "WireClient");
-        Assert.assertNotNull(aWireClient);
-        
-        aWireClient = domain.getService(WireClient.class, "AnotherWireClient");
-        Assert.assertNotNull(aWireClient);
-    }
-
-    /**
-     * Shutdown the SCA domain
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/pom.xml b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/pom.xml
deleted file mode 100644
index bef9a05c8d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/pom.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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-itest</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>itest-ws-void-args-return</artifactId>

-    <name>Apache Tuscany SCA Web Services Void Args and Return Test</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-    

-</project>

diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
deleted file mode 100644
index 43e251369d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/Bean.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 voidtest;
-
-public class Bean {
-
-    private String first;
-    private String last;
-    
-    public String getLast() {
-        return last;
-    }
-    public void setLast(String last) {
-        this.last = last;
-    }
-    public String getFirst() {
-        return first;
-    }
-    public void setFirst(String first) {
-        this.first = first;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
deleted file mode 100644
index dc949b5191..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ /dev/null
@@ -1,64 +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 voidtest;

-

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

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-    public void giveGreetings(String name) {

-        System.out.println("Hello " + name);

-    }

-

-    public void giveGreetingsOneWay(String name) {

-        System.out.println("Hi " + name);

-    }

-

-    public String takeGreetings() {

-        return "Hello Stranger";

-    }

-

-    public void noGreetings() {

-        System.out.println("Hello, who's there?");

-    }

-    

-    public Bean getBean(){

-    	Bean bean = new Bean();

-    	bean.setFirst("wang");

-    	bean.setLast("feng");

-    	return bean;

-    }

-    

-    public Bean getNullBean(){

-    	return  null;

-    }

-    

-    public String getNullString(){

-    	return  null;

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
deleted file mode 100644
index 4777f793e0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ /dev/null
@@ -1,47 +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 voidtest;

-

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

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

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    String getGreetings(String name);

-

-    void giveGreetings(String name);

-

-    @OneWay

-    void giveGreetingsOneWay(String name);

-

-    String takeGreetings();

-

-    void noGreetings();

-    

-    Bean getBean();

-    

-    String getNullString();

-    

-    Bean getNullBean();

-}

-

diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
deleted file mode 100644
index d549bccaf0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ /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.    

- */

-package voidtest;

-

-public interface TestClient {

-    void runTest();

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
deleted file mode 100644
index 1cdd094c50..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ /dev/null
@@ -1,53 +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 voidtest;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNull;

-

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

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

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

-

-@Service(TestClient.class)

-@Scope("COMPOSITE")

-public class TestClientImpl implements TestClient {

-

-    private HelloWorldService helloService;

-

-    @Reference

-    public void setHelloService(HelloWorldService helloService) {

-        this.helloService = helloService;

-    }

-

-    public void runTest() {

-        assertEquals("Hello  Smith", helloService.getGreetings(" Smith"));

-        helloService.giveGreetings("Jones");

-        helloService.giveGreetingsOneWay("Brown");

-        assertEquals("Hello Stranger", helloService.takeGreetings());

-        helloService.noGreetings();

-        

-        assertEquals("wang",helloService.getBean().getFirst());

-        assertEquals("feng",helloService.getBean().getLast());

-        

-        assertNull(helloService.getNullString());

-        

-        assertNull(helloService.getNullBean());

-    }

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/resources/voidtest.composite b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/resources/voidtest.composite
deleted file mode 100644
index 0f31c4cd2c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ /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.    

--->

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

-    targetNamespace="http://voidtest"

-    xmlns:hw="http://voidtest"

-    name="voidtest">

-

-    <component name="TestClientComponent">

-        <implementation.java class="voidtest.TestClientImpl" />

-        <reference name="helloService">

-            <interface.java interface="voidtest.HelloWorldService"/>

-            <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent/HelloWorldService"/>

-        </reference>

-    </component>

-

-    <component name="HelloWorldServiceComponent">

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

-        <service name="HelloWorldService">

-            <interface.java interface="voidtest.HelloWorldService"/>

-            <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent/HelloWorldService"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
deleted file mode 100644
index eaaa67c22c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ /dev/null
@@ -1,53 +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 voidtest;

-

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

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that methods with no args and/or void return type work over Web services

- */

-public class VoidArgsReturnTestCase {

-

-    private SCADomain scaDomain;

-    private TestClient client;

-

-    @Before

-    public void startServer() throws Exception {

-        scaDomain = SCADomain.newInstance("voidtest.composite");

-        client = scaDomain.getService(TestClient.class, "TestClientComponent");

-    }

-

-    @Test

-    public void testVoidCases() throws Exception {

-        client.runTest();

-        System.out.println("Sleeping...");

-        Thread.sleep(2000);

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        scaDomain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/pom.xml b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/pom.xml
deleted file mode 100644
index d8afff78fe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/pom.xml
+++ /dev/null
@@ -1,135 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wsdl-multiple</artifactId>
-    <name>Apache Tuscany SCA Multiple WSDL File Support Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!--plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <javaPackage>com.bigbank.account</javaPackage>
-                            <prefix>Account</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin-->
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
deleted file mode 100644
index 842ae0a692..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldCallback {
-
-    public void getGreetingsCallback(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
deleted file mode 100644
index d2d898e9c4..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldClientImpl implements HelloWorldService, HelloWorldCallback {
-   
-    @Reference 
-    protected HelloWorldService helloWorldService;
-
-    public void getGreetings(String name) {
-        helloWorldService.getGreetings(name);
-    }
-    
-    public void getGreetingsCallback(String name) {
-        System.out.println("Callback " + name);
-    }
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index d4fbd434fe..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,32 +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 helloworld;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-@Callback(HelloWorldCallback.class)
-public interface HelloWorldService {
-
-    public void getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index a46f763960..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ /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.    
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-    
-    @Callback
-    protected HelloWorldCallback helloWorldCallback; 
-
-    public void getGreetings(String name) {
-        helloWorldCallback.getGreetingsCallback(name);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
deleted file mode 100644
index 9d9ed57cc7..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" 
-           name="autohelloworldws">
-    
-  <component name="HelloWorldClientComponent">
-    <implementation.java class="helloworld.HelloWorldClientImpl"/>
-    <reference name="helloWorldService">
-      <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService"/>        
-      </callback>
-    </reference>
-  </component>
-  
-  <component name="HelloWorldServiceComponent">
-    <implementation.java class="helloworld.HelloWorldServiceImpl"/>
-    <service name="HelloWorldService">
-      <interface.java interface="helloworld.HelloWorldService" callbackInterface="helloworld.HelloWorldCallback"/>
-      <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService"/>        
-      </callback>
-    </service>
-  </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
deleted file mode 100644
index 0c1dc5d353..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ /dev/null
@@ -1,46 +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://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" 
-           name="manualhelloworldws">
-    
-  <component name="HelloWorldClientComponent">
-    <implementation.java class="helloworld.HelloWorldClientImpl"/>
-    <reference name="helloWorldService">
-      <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldServiceSOAP11port)"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService" 
-                    wsdlElement="http://helloworld#wsdl.binding(HelloWorldCallbackSOAP11Binding)"/>        
-      </callback>
-    </reference>
-  </component>
-  
-  <component name="HelloWorldServiceComponent">
-    <implementation.java class="helloworld.HelloWorldServiceImpl"/>
-    <service name="HelloWorldService">
-      <interface.java interface="helloworld.HelloWorldService" callbackInterface="helloworld.HelloWorldCallback"/>
-      <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldServiceSOAP11port)"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService"
-                    wsdlElement="http://helloworld#wsdl.binding(HelloWorldCallbackSOAP11Binding)"/>        
-      </callback>
-    </service>
-  </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
deleted file mode 100644
index ea2f93c3e6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ /dev/null
@@ -1,98 +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://helloworld"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:ns="http://helloworld/xsd" 
-	xmlns:axis2="http://helloworld">
-	<wsdl:types>
-		<xs:schema attributeFormDefault="qualified"
-			elementFormDefault="qualified"
-			targetNamespace="http://helloworld/xsd"
-			xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:element name="getGreetingsCallback">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="param0" nillable="true"
-							type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-            <xs:element name="getGreetingsCallbackResponse">
-                <xs:complexType/>
-            </xs:element>			
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="getGreetingsCallbackMessage">
-		<wsdl:part name="part1" element="ns:getGreetingsCallback">
-		</wsdl:part>
-	</wsdl:message>
-    <wsdl:message name="getGreetingsCallbackResponseMessage">
-        <wsdl:part name="part1" element="ns:getGreetingsCallbackResponse">
-        </wsdl:part>
-    </wsdl:message>	
-	<wsdl:portType name="HelloWorldCallbackPortType">
-		<wsdl:operation name="getGreetingsCallback">
-			<wsdl:input message="axis2:getGreetingsCallbackMessage">
-			</wsdl:input>
-            <wsdl:output message="axis2:getGreetingsCallbackResponseMessage">
-            </wsdl:output>			
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="HelloWorldCallbackSOAP11Binding"
-		type="axis2:HelloWorldCallbackPortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetingsCallback">
-			<soap:operation soapAction="urn:getGreetingsCallback"
-				style="document" />
-			<wsdl:input>
-				<soap:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:binding name="HelloWorldCallbackSOAP12Binding"
-		type="axis2:HelloWorldCallbackPortType">
-		<soap12:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetingsCallback">
-			<soap12:operation soapAction="urn:getGreetingsCallback"
-				style="document" />
-			<wsdl:input>
-				<soap12:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="HelloWorldCallback">
-		<wsdl:port name="HelloWorldCallbackSOAP11port"
-			binding="axis2:HelloWorldCallbackSOAP11Binding">
-			<soap:address
-				location="http://localhost:8085/axis2/services/HelloWorldCallback" />
-		</wsdl:port>
-		<wsdl:port name="HelloWorldCallbackSOAP12port"
-			binding="axis2:HelloWorldCallbackSOAP12Binding">
-			<soap12:address
-				location="http://localhost:8085/axis2/services/HelloWorldCallback" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
deleted file mode 100644
index 1e50e146f2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ /dev/null
@@ -1,95 +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://helloworld"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:ns="http://helloworld/xsd" 
-	xmlns:axis2="http://helloworld">
-	<wsdl:types>
-		<xs:schema attributeFormDefault="qualified"
-			elementFormDefault="qualified"
-			targetNamespace="http://helloworld/xsd"
-			xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:element name="getGreetings">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="param0" nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-            <xs:element name="getGreetingsResponse">
-                <xs:complexType/>
-            </xs:element>			
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="getGreetingsMessage">
-		<wsdl:part name="part1" element="ns:getGreetings"></wsdl:part>
-	</wsdl:message>
-    <wsdl:message name="getGreetingsResponseMessage">
-        <wsdl:part name="part1" element="ns:getGreetingsResponse"></wsdl:part>
-    </wsdl:message>	
-	<wsdl:portType name="HelloWorldServicePortType">
-		<wsdl:operation name="getGreetings">
-			<wsdl:input message="axis2:getGreetingsMessage">
-			</wsdl:input>
-            <wsdl:output message="axis2:getGreetingsResponseMessage">
-            </wsdl:output>			
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="HelloWorldServiceSOAP12Binding"
-		type="axis2:HelloWorldServicePortType">
-		<soap12:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetings">
-			<soap12:operation soapAction="urn:getGreetings"
-				style="document" />
-			<wsdl:input>
-				<soap12:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:binding name="HelloWorldServiceSOAP11Binding"
-		type="axis2:HelloWorldServicePortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetings">
-			<soap:operation soapAction="urn:getGreetings"
-				style="document" />
-			<wsdl:input>
-				<soap:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="HelloWorldService">
-		<wsdl:port name="HelloWorldServiceSOAP11port"
-			binding="axis2:HelloWorldServiceSOAP11Binding">
-			<soap:address
-				location="http://localhost:8085/axis2/services/HelloWorldService" />
-		</wsdl:port>
-		<wsdl:port name="HelloWorldServiceSOAP12port"
-			binding="axis2:HelloWorldServiceSOAP12Binding">
-			<soap12:address
-				location="http://localhost:8085/axis2/services/HelloWorldService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
deleted file mode 100644
index 6a872faa17..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ /dev/null
@@ -1,65 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the behaviour of the system when multiple WSDLs appear in the contribution
- * with the same namespace
- */
-public class AutoWSDLTestCase {
-
-    private static SCADomain domain;
-    
-    @BeforeClass
-    public static void init() throws Throwable {
-        try {
-            domain = SCADomain.newInstance("auto-wsdl.composite");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if ( domain != null){
-            domain.close();
-        }
-    }    
-
-    @Test
-    public void testLoadWSDL() {
-        try {
-            HelloWorldService client = domain.getService(HelloWorldService.class, "HelloWorldClientComponent/HelloWorldService");
-            client.getGreetings("petra");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-        //assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
deleted file mode 100644
index 5852f8d802..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ /dev/null
@@ -1,65 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the behaviour of the system when multiple WSDLs appear in the contribution
- * with the same namespace
- */
-public class ManualWSDLTestCase {
-
-    private static SCADomain domain;
-    
-    @BeforeClass
-    public static void init() throws Throwable {
-        try {
-            domain = SCADomain.newInstance("manual-wsdl.composite");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null){
-            domain.close();
-        }
-    }    
-
-    @Test
-    public void testLoadWSDL() {
-        try {
-            HelloWorldService client = domain.getService(HelloWorldService.class, "HelloWorldClientComponent/HelloWorldService");
-            client.getGreetings("petra");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-        //assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/pom.xml b/tags/java/sca/1.3-RC1a/itest/wsdl/pom.xml
deleted file mode 100644
index d8b9c94d2b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/pom.xml
+++ /dev/null
@@ -1,135 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wsdl</artifactId>
-    <name>Apache Tuscany SCA WSDL Support Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <javaPackage>com.bigbank.account</javaPackage>
-                            <prefix>Account</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index 265b11f7dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,92 +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 bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@AllowsPassByReference
-public interface AccountDataService {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
-            throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    public com.bigbank.account.AccountLog getAccountLog(int param0) throws java.rmi.RemoteException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index f8c9c28f26..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,93 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
-    public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int customerID) {
-
-        AccountReport report =AccountFactory.INSTANCE.createAccountReport();
-        AccountSummary summary1 = AccountFactory.INSTANCE.createAccountSummary();
-        summary1.setAccountNumber("123");
-        summary1.setAccountType("checking");
-        summary1.setBalance(1000.0f);
-        report.getAccountSummaries().add(summary1);
-        AccountSummary summary2 = AccountFactory.INSTANCE.createAccountSummary();
-        summary2.setAccountNumber("456");
-        summary2.setAccountType("savings");
-        summary2.setBalance(2000.0f);
-        report.getAccountSummaries().add(summary2);
-        
-        return report;
-    }
-
-    public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
-            throws RemoteException {
-        CustomerProfileData data = AccountFactory.INSTANCE.createCustomerProfileData();
-        data.setLoginID(customerProfile.getLoginID());
-        data.setAddress(customerProfile.getAddress());
-        data.setEmail(customerProfile.getEmail());
-        data.setFirstName(customerProfile.getFirstName());
-        data.setId(customerProfile.getId());
-        data.setLastName(customerProfile.getLastName());
-        data.setPassword(customerProfile.getPassword());
-        return data;
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary stock) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(final int customerID) throws RemoteException {
-        throw new RemoteException("This method should not be called");
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index f16d20689d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class AccountServiceClientImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index cba6f2ee6c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 9f15be0236..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index f174e1af07..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index 4a5b7bceef..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ /dev/null
@@ -1,98 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-/**
- * This interface allows access to a customer's id from the data service.
- */
-public interface CustomerIdService {
-
-    /*
-     * Return -1 if purchaseLotNumber not found
-     */
-    public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
-    /*
-     * Return -1 if account not found
-     */
-    public int getCustomerIdByAccount(String account) throws RemoteException;
-
-    // TODO (isilval) Fix this !!!
-    // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
-            throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c9076ebba6..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hi " + name;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index d706517b76..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,43 +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 helloworld;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 9d147dc013..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.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 org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component2aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index 7556e02b36..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.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 org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component2bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index e7031ff41c..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.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 org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component3aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index 7a049ed7b0..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.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 org.apache.tuscany.sca.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component3bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 62596ee62a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ /dev/null
@@ -1,344 +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://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="SDOWSDLTest">
-
-    <!-- dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-        factory="com.bigbank.account.AccountFactory" / -->
-
-    <service name="AccountService1a2a3a4a" promote="Component2a3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"  uri="http://localhost:8085/AccountService1a2a3a4a"/>
-    </service>
-    <service name="AccountService1a2a3a4b" promote="Component2a3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3a4b"/>
-    </service>
-    <service name="AccountService1a2a3b4a" promote="Component2a3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4a"/>
-    </service>
-    <service name="AccountService1a2a3b4b" promote="Component2a3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4b"/>
-    </service>
-    <service name="AccountService1a2b3a4a" promote="Component2b3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4a"/>
-    </service>
-    <service name="AccountService1a2b3a4b" promote="Component2b3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4b"/>
-    </service>
-    <service name="AccountService1a2b3b4a" promote="Component2b3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4a"/>
-    </service>
-    <service name="AccountService1a2b3b4b" promote="Component2b3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4b"/>
-    </service>
-    <service name="AccountService1b2a3a4a" promote="Component2a3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4a"/>
-    </service>
-    <service name="AccountService1b2a3a4b" promote="Component2a3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4b"/>
-    </service>
-    <service name="AccountService1b2a3b4a" promote="Component2a3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4a"/>
-    </service>
-    <service name="AccountService1b2a3b4b" promote="Component2a3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4b"/>
-    </service>
-    <service name="AccountService1b2b3a4a" promote="Component2b3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4a"/>
-    </service>
-    <service name="AccountService1b2b3a4b" promote="Component2b3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4b"/>
-    </service>
-    <service name="AccountService1b2b3b4a" promote="Component2b3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4a"/>
-    </service>
-    <service name="AccountService1b2b3b4b" promote="Component2b3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4aRef" promote="Component3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4bRef" promote="Component3a4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4aRef" promote="Component3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-    
-    <component name="Component3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4bRef" promote="Component3b4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <!-- target service -->
-
-    <service name="AccountService" promote="AccountServiceComponent">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService"/>
-    </service>
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.account.services.accountdata.AccountDataServiceImpl" />
-    </component>
-
-    <!-- test client -->
-
-    <component name="AccountServiceClient">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="AccountServiceRef" promote="AccountServiceClient/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"/>
-    </reference>
-
-    <!-- clients -->
-
-    <component name="Client1a2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3a4a" />
-    </reference>
-
-    <component name="Client1a2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl"/>
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3a4b" />
-    </reference>
-
-    <component name="Client1a2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3b4a" />
-    </reference>
-
-    <component name="Client1a2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3b4b" />
-    </reference>
-
-    <component name="Client1a2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3a4a" />
-    </reference>
-
-    <component name="Client1a2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3a4b" />
-    </reference>
-
-    <component name="Client1a2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3b4a" />
-    </reference>
-
-    <component name="Client1a2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3b4b" />
-    </reference>
-
-    <component name="Client1b2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3a4a" />
-    </reference>
-
-    <component name="Client1b2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3a4b" />
-    </reference>
-
-    <component name="Client1b2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3b4a" />
-    </reference>
-
-    <component name="Client1b2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3b4b" />
-    </reference>
-
-    <component name="Client1b2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3a4a" />
-    </reference>
-
-    <component name="Client1b2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3a4b" />
-    </reference>
-
-    <component name="Client1b2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3b4a" />
-    </reference>
-
-    <component name="Client1b2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3b4b" />
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/WSDLTest.composite b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/WSDLTest.composite
deleted file mode 100644
index 2024578dae..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/WSDLTest.composite
+++ /dev/null
@@ -1,371 +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://www.osoa.org/xmlns/sca/1.0"
-
-           name="WSDLTest">
-   
-    <service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4b"/>
-    </service>
-
-    <service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2a3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2a3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2a3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component2b3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2b3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2b3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2b3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4aRef" promote="Component3a4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4bRef" promote="Component3a4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4aRef" promote="Component3b4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4bRef" promote="Component3b4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-
-<!-- the servive -->    
-    
-    <service name="HelloWorldWebService"  promote="HelloWorldServiceComponent" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldWebService"/>
-    </service>
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>
-    
-<!-- the clients -->
-
-    <component name="Client1a2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3a4a" />
-    </reference>
-    
-    <component name="Client1a2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3a4b" />
-    </reference>
-    
-    <component name="Client1a2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3b4a" />
-    </reference>
-    
-    <component name="Client1a2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3b4b" />
-    </reference>
-    
-    <component name="Client1a2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3a4a" />
-    </reference>
-    
-    <component name="Client1a2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3a4b" />
-    </reference>
-    
-    <component name="Client1a2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3b4a" />
-    </reference>
-    
-    <component name="Client1a2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3b4b" />
-    </reference>
-    
-    <component name="Client1b2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3a4a" />
-    </reference>
-    
-    <component name="Client1b2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3a4b" />
-    </reference>
-    
-    <component name="Client1b2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3b4a" />
-    </reference>
-    
-    <component name="Client1b2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3b4b" />
-    </reference>
-    
-    <component name="Client1b2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3a4a" />
-    </reference>
-    
-    <component name="Client1b2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/>
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3a4b" />
-    </reference>
-    
-    <component name="Client1b2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3b4a" />
-    </reference>
-    
-    <component name="Client1b2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3b4b" />
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 73f9ed4bfc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,453 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-			
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-			    <!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-				
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock" type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-                        <xsd:element name="createSavings"
-							type="xsd:boolean" />
-                        <xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>	
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-				
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount" name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="account:AccountServiceSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8085/services/AccountService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 3921dec72d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,80 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location=""/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index 12441753fb..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ /dev/null
@@ -1,169 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import bigbank.account.services.accountdata.AccountDataService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl.
- * 
- * The tests use a service (1) wired to a components (2) wired to another 
- * component (3) wired to a reference (4). Each of those uses either 
- * interface.java (a) or interface.wsdl (b). This results in 16 different
- * combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class SDOWSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() throws RemoteException  {
-        doit("Client1a2a3a4a");
-    }
-
-    @Test
-    public void testClient1a2a3a4b() throws RemoteException  {
-        doit("Client1a2a3a4b");
-    }
-
-    @Test
-    public void testClient1a2a3b4a() throws RemoteException  {
-        doit("Client1a2a3b4a");
-    }
-
-    @Test
-    public void testClient1a2a3b4b() throws RemoteException  {
-        doit("Client1a2a3b4b");
-    }
-
-    @Test
-    public void testClient1a2b3a4a() throws RemoteException  {
-        doit("Client1a2b3a4a");
-    }
-
-    @Test
-    public void testClient1a2b3a4b() throws RemoteException  {
-        doit("Client1a2b3a4b");
-    }
-
-    @Test
-    public void testClient1a2b3b4a() throws RemoteException  {
-        doit("Client1a2b3b4a");
-    }
-
-    @Test
-    public void testClient1a2b3b4b() throws RemoteException  {
-        doit("Client1a2b3b4b");
-    }
-
-    @Test
-    public void testClient1b2a3a4a() throws RemoteException  {
-        doit("Client1b2a3a4a");
-    }
-
-    @Test
-    public void testClient1b2a3a4b() throws RemoteException  {
-        doit("Client1b2a3a4b");
-    }
-
-    @Test
-    public void testClient1b2a3b4a() throws RemoteException  {
-        doit("Client1b2a3b4a");
-    }
-
-    @Test
-    public void testClient1b2a3b4b() throws RemoteException  {
-        doit("Client1b2a3b4b");
-    }
-
-    @Test
-    public void testClient1b2b3a4a() throws RemoteException  {
-        doit("Client1b2b3a4a");
-    }
-
-    @Test
-    public void testClient1b2b3a4b() throws RemoteException  {
-        doit("Client1b2b3a4b");
-    }
-
-    @Test
-    public void testClient1b2b3b4a() throws RemoteException  {
-        doit("Client1b2b3b4a");
-    }
-
-    @Test
-    public void testClient1b2b3b4b() throws RemoteException  {
-        doit("Client1b2b3b4b");
-    }
-
-    private void doit(String compName) throws RemoteException {
-        AccountDataService client = domain.getService(AccountDataService.class, compName);
-        CustomerProfileData dataIn = AccountFactory.INSTANCE.createCustomerProfileData();
-        dataIn.setAddress("home");
-        dataIn.setEmail("petra@home");
-        dataIn.setFirstName("petra");
-        dataIn.setId(1);
-        dataIn.setLastName("A");
-        dataIn.setLoginID("petra");
-        dataIn.setPassword("ant");
-        
-        CustomerProfileData dataOut = client.createAccount(dataIn , false, false);
-        
-        assertEquals(dataIn.getAddress(), dataOut.getAddress());
-        assertEquals(dataIn.getEmail(), dataOut.getEmail());
-        assertEquals(dataIn.getFirstName(), dataOut.getFirstName());
-        assertEquals(dataIn.getId(), dataOut.getId());
-        assertEquals(dataIn.getLastName(), dataOut.getLastName());
-        assertEquals(dataIn.getLoginID(), dataOut.getLoginID());
-        assertEquals(dataIn.getPassword(), dataOut.getPassword());
-        
-        AccountReport report = client.getAccountReport(12345);
-        AccountSummary summary1 = (AccountSummary)report.getAccountSummaries().get(0);
-        assertEquals(summary1.getAccountType(), "checking");
-        AccountSummary summary2 = (AccountSummary)report.getAccountSummaries().get(1);
-        assertEquals(summary2.getBalance(), 2000.f);
-    }
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        domain = SCADomain.newInstance("SDOWSDLTest.composite");
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index fd30d69c79..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ /dev/null
@@ -1,146 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl. The tests use a service
- * (1) wired to a components (2) wired to another component (3) wired to a
- * reference (4). Each of those uses either interface.java (a) or interface.wsdl
- * (b). This results in 16 different combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class WSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @BeforeClass
-    public static void init() throws Throwable {
-        domain = SCADomain.newInstance("WSDLTest.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl2java/pom.xml b/tags/java/sca/1.3-RC1a/itest/wsdl2java/pom.xml
deleted file mode 100644
index e2424eca4a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl2java/pom.xml
+++ /dev/null
@@ -1,188 +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-itest</artifactId>
-		<version>1.3</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-wsdl2java</artifactId>
-	<name>Apache Tuscany SCA WSDL2Java Integration Tests</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.1-incubating</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.0</version>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>target/sdo-source</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1-incubating</version>
-				<executions>
-					<execution>
-						<id>generate-sdo-account-service</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>
-								${basedir}/src/test/resources/AccountService.wsdl</schemaFile>
-							<targetDirectory>
-								${basedir}/target/sdo-source</targetDirectory>
-							<javaPackage>com.bigbank.account</javaPackage>
-							<prefix>Account</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>generate-sdo-stock-exception</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>
-								${basedir}/src/test/resources/StockExceptionTest.wsdl</schemaFile>
-							<targetDirectory>
-								${basedir}/target/sdo-source</targetDirectory>
-							<prefix>Stock</prefix>
-							<noInterfaces>true</noInterfaces>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-					<!--execution>
-                        <id>generate-sdo-echo-service-xsd</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/EchoService.xsd</schemaFile>
-                            <targetDirectory>${basedir}/target/sdo-source</targetDirectory>
-                            <prefix>Stock</prefix>
-                            <noInterfaces>true</noInterfaces>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution-->
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sca</groupId>
-				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>
-										${basedir}/src/test/resources/AccountService.wsdl</fileName>
-								</wsdlFile>
-								<wsdlFile>
-									<fileName>
-										${basedir}/src/test/resources/StockExceptionTest.wsdl</fileName>
-								</wsdlFile>
-								<!--wsdlFile>
-									<fileName>${basedir}/src/test/resources/EchoService.wsdl</fileName>
-								</wsdlFile-->
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/AccountService.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 9e5650e7dd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ /dev/null
@@ -1,479 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountServiceWithFault">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-				<!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<!-- @start added fault -->
-			<xsd:element name="insufficientFundsFault">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="message" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<!-- @end added fault -->
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-						<xsd:element name="createSavings"
-							type="xsd:boolean" />
-						<xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<!-- @start added fault -->
-	<wsdl:message name="insufficientFundsException">
-		<wsdl:part element="account:insufficientFundsFault"
-			name="insufficientFundsFault" />
-	</wsdl:message>
-	<!-- @end added fault -->
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount"
-			name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse"
-			name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountServiceWithFault">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-			<!-- @start added fault -->
-			<wsdl:fault message="account:insufficientFundsException"
-				name="insufficientFundsException" />
-			<!-- @end added fault -->
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceWithFaultSOAP"
-		type="account:AccountServiceWithFault">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-			<!-- @start added fault -->
-			<wsdl:fault name="insufficientFundsException">
-				<soap:fault name="insufficientFundsException" use="literal" />
-			</wsdl:fault>
-			<!-- @end added fault -->
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountServiceWithFault">
-		<wsdl:port binding="account:AccountServiceWithFaultSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8080/sample-bigbank-account/services/AccountServiceWithFault" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/EchoService.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/EchoService.wsdl
deleted file mode 100644
index 50d580f299..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ /dev/null
@@ -1,64 +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.    
--->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://test/" 
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="EchoService" 
-	targetNamespace="http://test/">
-	
-	<types>
-		<xsd:schema>
-			<xsd:import namespace="http://test/"
-				schemaLocation="EchoService.xsd" />
-		</xsd:schema>
-	</types>
-	<message name="echo">
-		<part element="tns:echo" name="parameters" />
-	</message>
-	<message name="echoResponse">
-		<part element="tns:echoResponse" name="parameters" />
-	</message>
-	<portType name="Echo">
-		<operation name="echo">
-			<input message="tns:echo" />
-			<output message="tns:echoResponse" />
-		</operation>
-	</portType>
-	<binding name="EchoPortBinding" type="tns:Echo">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<operation name="echo">
-			<soap:operation soapAction="" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-	</binding>
-	<service name="EchoService">
-		<port binding="tns:EchoPortBinding" name="EchoPort">
-			<soap:address
-				location="http://localhost:8085/w1/EchoService" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/EchoService.xsd b/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/EchoService.xsd
deleted file mode 100644
index 8069d4861f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ /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.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns:tns="http://test/" 
-	targetNamespace="http://test/" version="1.0">
-	
-	<xs:complexType name="echoType">
-		<xs:sequence>
-			<xs:element minOccurs="0" name="arg0" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="echoResponseType">
-		<xs:sequence>
-			<xs:element minOccurs="0" name="return" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:element name="echo" type="tns:echoType"/>
-	
-	<xs:element name="echoResponse" type="tns:echoResponseType"/>
-	
-</xs:schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
deleted file mode 100644
index c44229c162..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,167 +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://scatesttool.stockexceptiontestservice"
-	xmlns:impl="http://scatesttool.stockexceptiontestservice"
-	xmlns:tns="http://scatesttool.stockexceptiontestservice"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="StockExceptionTest">
-	<wsdl:types>
-		<schema
-			targetNamespace="http://scatesttool.stockexceptiontestservice"
-			xmlns="http://www.w3.org/2001/XMLSchema"
-			xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			
-			<complexType name="StockOffer">
-				<sequence>
-					<element name="symbol" minOccurs="1"
-						type="xsd:string" />
-					<element name="price" minOccurs="1" type="xsd:float"
-						nillable="true" /><!-- max price reqested, actual response -->
-					<element name="name" minOccurs="0"
-						type="xsd:string" />
-				</sequence>
-			</complexType>
-
-			<element name="stockQuoteOffer">
-				<complexType>
-					<sequence>
-						<element name="input" minOccurs="0"
-							type="tns:StockOffer" />
-					</sequence>
-				</complexType>
-			</element>
-			<element name="stockQuoteOfferResponse">
-				<complexType>
-					<sequence>
-						<element name="stockQuoteOfferReturn"
-							minOccurs="0" type="tns:StockOffer" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<!-- Faults -->
-			<element name="invalidSymbolFault">
-				<complexType>
-					<sequence>
-						<element name="message" minOccurs="1"
-							type="xsd:string" />
-						<element name="offer" minOccurs="1"
-							type="tns:StockOffer" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="marketClosedFault">
-				<complexType>
-					<sequence>
-						<element name="message" minOccurs="1"
-							type="xsd:string" />
-					</sequence>
-				</complexType>
-			</element>
-
-		</schema>
-	</wsdl:types>
-
-
-	<wsdl:message name="stockQuoteOfferRequest">
-		<wsdl:part element="tns:stockQuoteOffer" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="stockQuoteOfferResponse">
-		<wsdl:part element="tns:stockQuoteOfferResponse"
-			name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="invalidSymbolException">
-		<wsdl:part element="tns:invalidSymbolFault" name="fault" />
-	</wsdl:message>
-
-	<wsdl:message name="marketClosedException">
-		<wsdl:part element="tns:marketClosedFault" name="fault" />
-	</wsdl:message>
-
-
-	<wsdl:portType name="StockExceptionTest">
-		<wsdl:operation name="stockQuoteOffer">
-			<wsdl:input message="tns:stockQuoteOfferRequest"
-				name="stockQuoteOfferRequest" />
-
-			<wsdl:output message="tns:stockQuoteOfferResponse"
-				name="stockQuoteOfferResponse" />
-
-			<wsdl:fault message="tns:invalidSymbolException"
-				name="InvalidSymbolException" />
-
-			<wsdl:fault message="tns:marketClosedException"
-				name="MarketClosedException" />
-
-		</wsdl:operation>
-
-
-	</wsdl:portType>
-
-	<wsdl:binding name="StockExceptionTestServiceSoapBinding"
-		type="tns:StockExceptionTest">
-		<!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
-
-		<wsdlsoap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-
-		<wsdl:operation name="stockQuoteOffer">
-			<wsdlsoap:operation soapAction="" />
-
-			<wsdl:input name="stockQuoteOfferRequest">
-				<wsdlsoap:body use="literal" />
-			</wsdl:input>
-
-			<wsdl:output name="stockQuoteOfferResponse">
-				<wsdlsoap:body use="literal" />
-			</wsdl:output>
-
-			<wsdl:fault name="InvalidSymbolException">
-				<wsdlsoap:fault name="InvalidSymbolException" use="literal" />
-			</wsdl:fault>
-
-			<wsdl:fault name="MarketClosedException">
-				<wsdlsoap:fault name="MarketClosedException" use="literal" />
-			</wsdl:fault>
-
-		</wsdl:operation>
-
-
-	</wsdl:binding>
-
-	<wsdl:service name="StockExceptionTestService">
-		<wsdl:port binding="tns:StockExceptionTestServiceSoapBinding"
-			name="StockExceptionTestServiceSoapPort">
-			<wsdlsoap:address
-				location="http://localhost:8080/StockExceptionTestService/services/StockExceptionTestService" />
-
-		</wsdl:port>
-
-	</wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/pom.xml b/tags/java/sca/1.3-RC1a/itest/wsdlless/pom.xml
deleted file mode 100644
index ea92f40fde..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/pom.xml
+++ /dev/null
@@ -1,202 +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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wsdlless</artifactId>
-    <name>Apache Tuscany SCA WSDLless Support Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.4</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <!-- 
-                                <artifactItem>
-                                    <groupId>com.sun.xml.ws</groupId>
-                                    <artifactId>jaxws-rt</artifactId>
-                                    <version>2.1.4</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                 -->
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1-incubating</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <javaPackage>com.bigbank.account</javaPackage>
-                            <prefix>Account</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index 5886ebc6ff..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,95 +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 bigbank.account.services.accountdata;
-
-import javax.jws.WebService;
-import javax.xml.ws.ResponseWrapper;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@AllowsPassByReference
-@WebService(targetNamespace="http://www.bigbank.com/account")
-public interface AccountDataService {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    @ResponseWrapper(localName="purchaseStockResponse")
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    public com.bigbank.account.AccountLog getAccountLog(int param0);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index df658428fd..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,91 +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 bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
-    public CustomerProfileData getCustomerProfile(String logonID) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int customerID) {
-
-        AccountReport report =AccountFactory.INSTANCE.createAccountReport();
-        AccountSummary summary1 = AccountFactory.INSTANCE.createAccountSummary();
-        summary1.setAccountNumber("123");
-        summary1.setAccountType("checking");
-        summary1.setBalance(1000.0f);
-        report.getAccountSummaries().add(summary1);
-        AccountSummary summary2 = AccountFactory.INSTANCE.createAccountSummary();
-        summary2.setAccountNumber("456");
-        summary2.setAccountType("savings");
-        summary2.setBalance(2000.0f);
-        report.getAccountSummaries().add(summary2);
-        
-        return report;
-    }
-
-    public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
-            {
-        CustomerProfileData data = AccountFactory.INSTANCE.createCustomerProfileData();
-        data.setLoginID(customerProfile.getLoginID());
-        data.setAddress(customerProfile.getAddress());
-        data.setEmail(customerProfile.getEmail());
-        data.setFirstName(customerProfile.getFirstName());
-        data.setId(customerProfile.getId());
-        data.setLastName(customerProfile.getLastName());
-        data.setPassword(customerProfile.getPassword());
-        return data;
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary stock) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(final int customerID) {
-        throw new IllegalStateException("This method should not be called");
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index d39df8c00e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ /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.    
- */
-
-package bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class AccountServiceClientImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index d4a06780c3..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ /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.    
- */
-
-package bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 6dc46c60b5..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ /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.    
- */
-
-package bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index 8471000152..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ /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.    
- */
-
-package bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index 859c61a724..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ /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.    
- */
-
-package bigbank.account.services.accountdata;
-
-import org.osoa.sca.annotations.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ /dev/null
@@ -1,98 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-/**
- * This interface allows access to a customer's id from the data service.
- */
-public interface CustomerIdService {
-
-    /*
-     * Return -1 if purchaseLotNumber not found
-     */
-    public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
-    /*
-     * Return -1 if account not found
-     */
-    public int getCustomerIdByAccount(String account) throws RemoteException;
-
-    // TODO (isilval) Fix this !!!
-    // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
-            throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index ca7c25f3fa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,44 +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 helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hi " + name;
-    }
-
-    public String[] getMultipleGreetings(String[] names) {
-        if(names==null) {
-            return null;
-        } 
-        String[] greetings = new String[names.length];
-        for(int i=0; i<names.length;i++) {
-            greetings[i] = "Hi "+names[i];
-        }
-        return greetings;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 8b234599aa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,31 +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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-    public String[] getMultipleGreetings(String[] names);
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 03984f7252..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-
-    public String[] getMultipleGreetings(String[] names) {
-        return helloWorldService.getMultipleGreetings(names);
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 45bb697437..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ /dev/null
@@ -1,43 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component2aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-    
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index 9342c8e6ee..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ /dev/null
@@ -1,42 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component2bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index 6c5ac96b67..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ /dev/null
@@ -1,42 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component3aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index ebaf33f568..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ /dev/null
@@ -1,43 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.osoa.sca.annotations.Reference;
-
-public class Component3bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/AnObject.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/AnObject.java
deleted file mode 100644
index 65ba52f356..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/AnObject.java
+++ /dev/null
@@ -1,62 +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 service;
-
-public class AnObject {
-
-    private String someRetValue;
-    private Integer someOtherRetValue;
-
-    public AnObject() {
-    }
-
-    public AnObject(String someRetValue, Integer someOtherRetValue) {
-        this.someRetValue = someRetValue;
-        this.someOtherRetValue = someOtherRetValue;
-    }
-
-    /**
-     * @return the someOtherRetValue
-     */
-    public Integer getSomeOtherRetValue() {
-        return someOtherRetValue;
-    }
-
-    /**
-     * @param someOtherRetValue the someOtherRetValue to set
-     */
-    public void setSomeOtherRetValue(Integer someOtherRetValue) {
-        this.someOtherRetValue = someOtherRetValue;
-    }
-
-    /**
-     * @return the someRetValue
-     */
-    public String getSomeRetValue() {
-        return someRetValue;
-    }
-
-    /**
-     * @param someRetValue the someRetValue to set
-     */
-    public void setSomeRetValue(String someRetValue) {
-        this.someRetValue = someRetValue;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/MoreComplexObject.java
deleted file mode 100644
index 69eba6701d..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/MoreComplexObject.java
+++ /dev/null
@@ -1,53 +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 service;
-
-import java.io.Serializable;
-
-public class MoreComplexObject implements Serializable {
-    private static final long serialVersionUID = 43242314234123L;
-    private String stringParam;
-    private Integer intParam;
-    private String stringParam2;
-
-    public String getStringParam() {
-        return stringParam;
-    }
-
-    public void setStringParam(String stringParam) {
-        this.stringParam = stringParam;
-    }
-
-    public Integer getIntParam() {
-        return intParam;
-    }
-
-    public void setIntParam(Integer intParam) {
-        this.intParam = intParam;
-    }
-
-    public String getStringParam2() {
-        return stringParam2;
-    }
-
-    public void setStringParam2(String stringParam2) {
-        this.stringParam2 = stringParam2;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/SomeService.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/SomeService.java
deleted file mode 100644
index f6aaacb23a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/SomeService.java
+++ /dev/null
@@ -1,31 +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 service;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface SomeService {
-
-    public AnObject getUsingString(String stringParam);
-
-    public AnObject getUsingMoreComplexObject(MoreComplexObject moreComplexParam);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
deleted file mode 100644
index 39a2131024..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
+++ /dev/null
@@ -1,42 +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 service;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(SomeService.class)
-public class SomeServiceImpl implements SomeService {
-
-    public AnObject getUsingString(String stringParam) {
-        System.out.println("Param value:" + stringParam);
-
-        return getAnObject(stringParam);
-    }
-
-    private AnObject getAnObject(String stringParam) {
-        return new AnObject(stringParam + "123", 123);
-    }
-
-    public AnObject getUsingMoreComplexObject(MoreComplexObject moreComplexParam) {
-        System.out.println("Param value:" + moreComplexParam.getStringParam());
-
-        return getAnObject(moreComplexParam.getStringParam());
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 16d3806318..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ /dev/null
@@ -1,321 +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://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="SDOWSDLTest">
-
-    <service name="AccountService1a2a3a4a" promote="Component2a3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4a"/>
-    </service>
-    <service name="AccountService1a2a3a4b" promote="Component2a3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4b"/>
-    </service>
-    <service name="AccountService1a2a3b4a" promote="Component2a3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4a"/>
-    </service>
-    <service name="AccountService1a2a3b4b" promote="Component2a3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4b"/>
-    </service>
-    <service name="AccountService1a2b3a4a" promote="Component2b3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4a"/>
-    </service>
-    <service name="AccountService1a2b3a4b" promote="Component2b3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4b"/>
-    </service>
-    <service name="AccountService1a2b3b4a" promote="Component2b3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4a"/>
-    </service>
-    <service name="AccountService1a2b3b4b" promote="Component2b3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4b"/>
-    </service>
-    <service name="AccountService1b2a3a4a" promote="Component2a3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4a"/>
-    </service>
-    <service name="AccountService1b2a3a4b" promote="Component2a3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4b"/>
-    </service>
-    <service name="AccountService1b2a3b4a" promote="Component2a3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4a"/>
-    </service>
-    <service name="AccountService1b2a3b4b" promote="Component2a3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4b"/>
-    </service>
-    <service name="AccountService1b2b3a4a" promote="Component2b3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4a"/>
-    </service>
-    <service name="AccountService1b2b3a4b" promote="Component2b3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4b"/>
-    </service>
-    <service name="AccountService1b2b3b4a" promote="Component2b3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4a"/>
-    </service>
-    <service name="AccountService1b2b3b4b" promote="Component2b3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4aRef" promote="Component3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4bRef" promote="Component3a4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4aRef" promote="Component3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-    
-    <component name="Component3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4bRef" promote="Component3b4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <!-- target service -->
-
-    <service name="AccountService" promote="AccountServiceComponent">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService"/>
-    </service>
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.account.services.accountdata.AccountDataServiceImpl" />
-    </component>
-
-    <!-- test client -->
-
-    <component name="AccountServiceClient">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="AccountServiceRef" promote="AccountServiceClient/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/services/AccountService"/>
-    </reference>
-
-    <!-- clients -->
-
-    <component name="Client1a2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4a" />
-    </reference>
-
-    <component name="Client1a2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl"/>
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4b" />
-    </reference>
-
-    <component name="Client1a2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4a" />
-    </reference>
-
-    <component name="Client1a2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4b" />
-    </reference>
-
-    <component name="Client1a2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4a" />
-    </reference>
-
-    <component name="Client1a2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4b" />
-    </reference>
-
-    <component name="Client1a2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4a" />
-    </reference>
-
-    <component name="Client1a2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4b" />
-    </reference>
-
-    <component name="Client1b2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4a" />
-    </reference>
-
-    <component name="Client1b2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4b" />
-    </reference>
-
-    <component name="Client1b2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4a" />
-    </reference>
-
-    <component name="Client1b2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4b" />
-    </reference>
-
-    <component name="Client1b2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4a" />
-    </reference>
-
-    <component name="Client1b2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4b" />
-    </reference>
-
-    <component name="Client1b2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4a" />
-    </reference>
-
-    <component name="Client1b2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4b" />
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/WSDLTest.composite b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/WSDLTest.composite
deleted file mode 100644
index e69cdbc282..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ /dev/null
@@ -1,350 +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://www.osoa.org/xmlns/sca/1.0"
-	name="WSDLTest">
-   
-    <service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4b"/>
-    </service>
-
-    <service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2a3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2a3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2a3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component2b3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2b3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2b3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2b3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4aRef" promote="Component3a4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4bRef" promote="Component3a4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4aRef" promote="Component3b4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4bRef" promote="Component3b4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-
-<!-- the servive -->    
-    
-    <service name="HelloWorldWebService"  promote="HelloWorldServiceComponent" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService"/>
-    </service>
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>
-    
-<!-- the clients -->
-
-    <component name="Client1a2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4a" />
-    </reference>
-    
-    <component name="Client1a2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4b" />
-    </reference>
-    
-    <component name="Client1a2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4a" />
-    </reference>
-    
-    <component name="Client1a2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4b" />
-    </reference>
-    
-    <component name="Client1a2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4a" />
-    </reference>
-    
-    <component name="Client1a2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4b" />
-    </reference>
-    
-    <component name="Client1a2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4a" />
-    </reference>
-    
-    <component name="Client1a2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4b" />
-    </reference>
-    
-    <component name="Client1b2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4a" />
-    </reference>
-    
-    <component name="Client1b2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4b" />
-    </reference>
-    
-    <component name="Client1b2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4a" />
-    </reference>
-    
-    <component name="Client1b2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4b" />
-    </reference>
-    
-    <component name="Client1b2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4a" />
-    </reference>
-    
-    <component name="Client1b2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/>
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4b" />
-    </reference>
-    
-    <component name="Client1b2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4a" />
-    </reference>
-    
-    <component name="Client1b2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4b" />
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/some.composite b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/some.composite
deleted file mode 100644
index 1b099239d1..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/some.composite
+++ /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.

--->

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

-    name="some">

-    <service name="SomeServices" promote="SomeServicesComponent">

-        <binding.ws uri="http://localhost:8085/SomeServices" />

-    </service>

-

-    <component name="SomeServicesComponent">

-        <implementation.java class="service.SomeServiceImpl" />

-        <service name="SomeService">

-            <interface.java interface="service.SomeService" />

-        </service>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 73f9ed4bfc..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,453 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-			
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-			    <!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-				
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock" type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-                        <xsd:element name="createSavings"
-							type="xsd:boolean" />
-                        <xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>	
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-				
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount" name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="account:AccountServiceSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8085/services/AccountService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index bc6fe0e89a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,131 +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://helloworld"
-	xmlns:tns="http://helloworld"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-	<wsdl:types>
-		<schema elementFormDefault="qualified"
-			targetNamespace="http://helloworld"
-			xmlns="http://www.w3.org/2001/XMLSchema">
-
-			<element name="getGreetings">
-				<complexType>
-					<sequence>
-						<element name="name" type="xsd:string" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="getGreetingsResponse">
-				<complexType>
-					<sequence>
-						<element name="getGreetingsReturn"
-							type="xsd:string" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="getMultipleGreetings">
-				<complexType>
-					<sequence>
-						<element name="name" type="xsd:string"
-							maxOccurs="unbounded" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="getMultipleGreetingsResponse">
-				<complexType>
-					<sequence>
-						<element name="getGreetingsReturn"
-							type="xsd:string" maxOccurs="unbounded" />
-					</sequence>
-				</complexType>
-			</element>
-		</schema>
-	</wsdl:types>
-
-	<wsdl:message name="getGreetingsRequest">
-		<wsdl:part element="tns:getGreetings" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="getGreetingsResponse">
-		<wsdl:part element="tns:getGreetingsResponse" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="getMultipleGreetingsRequest">
-		<wsdl:part element="tns:getMultipleGreetings" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="getMultipleGreetingsResponse">
-		<wsdl:part element="tns:getMultipleGreetingsResponse"
-			name="parameters" />
-	</wsdl:message>
-
-	<wsdl:portType name="HelloWorld">
-		<wsdl:operation name="getGreetings">
-			<wsdl:input message="tns:getGreetingsRequest"
-				name="getGreetingsRequest" />
-			<wsdl:output message="tns:getGreetingsResponse"
-				name="getGreetingsResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="getMultipleGreetings">
-			<wsdl:input message="tns:getMultipleGreetingsRequest"
-				name="getMultipleGreetingsRequest" />
-			<wsdl:output message="tns:getMultipleGreetingsResponse"
-				name="getMultipleGreetingsResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-	<wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-		<wsdlsoap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetings">
-			<wsdlsoap:operation soapAction="" />
-			<wsdl:input name="getGreetingsRequest">
-				<wsdlsoap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="getGreetingsResponse">
-				<wsdlsoap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getMultipleGreetings">
-			<wsdlsoap:operation soapAction="" />
-			<wsdl:input name="getMultipleGreetingsRequest">
-				<wsdlsoap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="getMultipleGreetingsResponse">
-				<wsdlsoap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="HelloWorldService">
-		<wsdl:port binding="tns:HelloWorldSoapBinding"
-			name="HelloWorldSoapPort">
-			<wsdlsoap:address location="" />
-		</wsdl:port>
-	</wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index 33f541b21b..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ /dev/null
@@ -1,173 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import bigbank.account.services.accountdata.AccountDataService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl.
- * 
- * The tests use a service (1) wired to a components (2) wired to another 
- * component (3) wired to a reference (4). Each of those uses either 
- * interface.java (a) or interface.wsdl (b). This results in 16 different
- * combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class SDOWSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() throws RemoteException  {
-        doit("Client1a2a3a4a");
-    }
-
-    @Test
-    public void testClient1a2a3a4b() throws RemoteException  {
-        doit("Client1a2a3a4b");
-    }
-
-    @Test
-    public void testClient1a2a3b4a() throws RemoteException  {
-        doit("Client1a2a3b4a");
-    }
-
-    @Test
-    public void testClient1a2a3b4b() throws RemoteException  {
-        doit("Client1a2a3b4b");
-    }
-
-    @Test
-    public void testClient1a2b3a4a() throws RemoteException  {
-        doit("Client1a2b3a4a");
-    }
-
-    @Test
-    public void testClient1a2b3a4b() throws RemoteException  {
-        doit("Client1a2b3a4b");
-    }
-
-    @Test
-    public void testClient1a2b3b4a() throws RemoteException  {
-        doit("Client1a2b3b4a");
-    }
-
-    @Test
-    public void testClient1a2b3b4b() throws RemoteException  {
-        doit("Client1a2b3b4b");
-    }
-
-    @Test
-    public void testClient1b2a3a4a() throws RemoteException  {
-        doit("Client1b2a3a4a");
-    }
-
-    @Test
-    public void testClient1b2a3a4b() throws RemoteException  {
-        doit("Client1b2a3a4b");
-    }
-
-    @Test
-    public void testClient1b2a3b4a() throws RemoteException  {
-        doit("Client1b2a3b4a");
-    }
-
-    @Test
-    public void testClient1b2a3b4b() throws RemoteException  {
-        doit("Client1b2a3b4b");
-    }
-
-    @Test
-    public void testClient1b2b3a4a() throws RemoteException  {
-        doit("Client1b2b3a4a");
-    }
-
-    @Test
-    public void testClient1b2b3a4b() throws RemoteException  {
-        doit("Client1b2b3a4b");
-    }
-
-    @Test
-    public void testClient1b2b3b4a() throws RemoteException  {
-        doit("Client1b2b3b4a");
-    }
-
-    @Test
-    public void testClient1b2b3b4b() throws RemoteException  {
-        doit("Client1b2b3b4b");
-    }
-
-    private void doit(String compName) throws RemoteException {
-        AccountDataService client = domain.getService(AccountDataService.class, compName);
-        CustomerProfileData dataIn = AccountFactory.INSTANCE.createCustomerProfileData();
-        dataIn.setAddress("home");
-        dataIn.setEmail("petra@home");
-        dataIn.setFirstName("petra");
-        dataIn.setId(1);
-        dataIn.setLastName("A");
-        dataIn.setLoginID("petra");
-        dataIn.setPassword("ant");
-        
-        CustomerProfileData dataOut = client.createAccount(dataIn , false, false);
-        
-        assertEquals(dataIn.getAddress(), dataOut.getAddress());
-        assertEquals(dataIn.getEmail(), dataOut.getEmail());
-        assertEquals(dataIn.getFirstName(), dataOut.getFirstName());
-        assertEquals(dataIn.getId(), dataOut.getId());
-        assertEquals(dataIn.getLastName(), dataOut.getLastName());
-        assertEquals(dataIn.getLoginID(), dataOut.getLoginID());
-        assertEquals(dataIn.getPassword(), dataOut.getPassword());
-        
-        AccountReport report = client.getAccountReport(12345);
-        AccountSummary summary1 = (AccountSummary)report.getAccountSummaries().get(0);
-        assertEquals(summary1.getAccountType(), "checking");
-        AccountSummary summary2 = (AccountSummary)report.getAccountSummaries().get(1);
-        assertEquals(summary2.getBalance(), 2000.f);
-    }
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try {
-        domain = SCADomain.newInstance("SDOWSDLTest.composite");
-        }catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index 82bf7ce650..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ /dev/null
@@ -1,150 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl. The tests use a service
- * (1) wired to a components (2) wired to another component (3) wired to a
- * reference (4). Each of those uses either interface.java (a) or interface.wsdl
- * (b). This results in 16 different combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class WSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-        String[] greetings = client.getMultipleGreetings(new String[] {"John", "Smith"});
-        assertEquals(2, greetings.length);
-        assertEquals("Hi John", greetings[0]);
-        assertEquals("Hi Smith", greetings[1]);
-    }
-
-    @Test
-    public void testClient1a2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @BeforeClass
-    public static void init() throws Throwable {
-        domain = SCADomain.newInstance("WSDLTest.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
deleted file mode 100644
index 7c62287c57..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
+++ /dev/null
@@ -1,83 +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 service;
-
-import static org.junit.Assert.assertEquals;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import service.generated.SomeServiceService;
-
-/**
- * @author pxk3
- *
- */
-public class SomeComponentTestCase {
-    private static SCADomain scaDomain;
-    private static SomeService someService;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("some.composite");
-        someService = scaDomain.getService(SomeService.class, "SomeServicesComponent");
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    @Test
-    public void testGetUsingMoreComplexObject() throws Exception {
-        String stringParam = "ABC";
-        URL url = new URL("http://localhost:8085/SomeServices?wsdl");
-        QName serviceQName = new QName("http://service/", "SomeServiceService");
-        SomeServiceService service = new SomeServiceService(url, serviceQName);
-        service.generated.SomeService proxy = service.getSomeServicePort();
-        service.generated.AnObject obj = proxy.getUsingString(stringParam);
-        assertEquals(stringParam + "123", obj.getSomeRetValue());
-
-        service.generated.MoreComplexObject obj2 = new service.generated.MoreComplexObject();
-        obj2.setStringParam(stringParam);
-        obj2.setStringParam2("2");
-        obj2.setIntParam(new Integer(0));
-
-        obj = proxy.getUsingMoreComplexObject(obj2);
-        assertEquals(stringParam + "123", obj.getSomeRetValue());
-    }
-
-    @Test
-    public void testLocal() {
-        String stringParam = "1234";
-        MoreComplexObject moreComplexParam = new MoreComplexObject();
-        moreComplexParam.setStringParam(stringParam);
-
-        AnObject anObject = someService.getUsingMoreComplexObject(moreComplexParam);
-
-        assertEquals(stringParam + "123", anObject.getSomeRetValue());
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/AnObject.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/AnObject.java
deleted file mode 100644
index effeb3c701..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/AnObject.java
+++ /dev/null
@@ -1,100 +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 service.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anObject complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="anObject">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="someOtherRetValue" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;element name="someRetValue" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "anObject", namespace = "", propOrder = {"someOtherRetValue", "someRetValue"})
-public class AnObject {
-
-    protected Integer someOtherRetValue;
-    protected String someRetValue;
-
-    /**
-     * Gets the value of the someOtherRetValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getSomeOtherRetValue() {
-        return someOtherRetValue;
-    }
-
-    /**
-     * Sets the value of the someOtherRetValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setSomeOtherRetValue(Integer value) {
-        this.someOtherRetValue = value;
-    }
-
-    /**
-     * Gets the value of the someRetValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSomeRetValue() {
-        return someRetValue;
-    }
-
-    /**
-     * Sets the value of the someRetValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSomeRetValue(String value) {
-        this.someRetValue = value;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
deleted file mode 100644
index 284e961788..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="arg0" type="{}moreComplexObject" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"arg0"})
-@XmlRootElement(name = "getUsingMoreComplexObject", namespace = "http://service/")
-public class GetUsingMoreComplexObject {
-
-    @XmlElementRef(name = "arg0", type = JAXBElement.class)
-    protected JAXBElement<MoreComplexObject> arg0;
-
-    /**
-     * Gets the value of the arg0 property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link MoreComplexObject }{@code >}
-     *     
-     */
-    public JAXBElement<MoreComplexObject> getArg0() {
-        return arg0;
-    }
-
-    /**
-     * Sets the value of the arg0 property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link MoreComplexObject }{@code >}
-     *     
-     */
-    public void setArg0(JAXBElement<MoreComplexObject> value) {
-        this.arg0 = ((JAXBElement<MoreComplexObject>)value);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
deleted file mode 100644
index 4113aa1a0a..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="return" type="{}anObject" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"_return"})
-@XmlRootElement(name = "getUsingMoreComplexObjectResponse", namespace = "http://service/")
-public class GetUsingMoreComplexObjectResponse {
-
-    @XmlElementRef(name = "return", type = JAXBElement.class)
-    protected JAXBElement<AnObject> _return;
-
-    /**
-     * Gets the value of the return property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public JAXBElement<AnObject> getReturn() {
-        return _return;
-    }
-
-    /**
-     * Sets the value of the return property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public void setReturn(JAXBElement<AnObject> value) {
-        this._return = ((JAXBElement<AnObject>)value);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
deleted file mode 100644
index 532b948b47..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"arg0"})
-@XmlRootElement(name = "getUsingString", namespace = "http://service/")
-public class GetUsingString {
-
-    @XmlElementRef(name = "arg0", type = JAXBElement.class)
-    protected JAXBElement<String> arg0;
-
-    /**
-     * Gets the value of the arg0 property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link String }{@code >}
-     *     
-     */
-    public JAXBElement<String> getArg0() {
-        return arg0;
-    }
-
-    /**
-     * Sets the value of the arg0 property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link String }{@code >}
-     *     
-     */
-    public void setArg0(JAXBElement<String> value) {
-        this.arg0 = ((JAXBElement<String>)value);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
deleted file mode 100644
index 82bfb2d2aa..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="return" type="{}anObject" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"_return"})
-@XmlRootElement(name = "getUsingStringResponse", namespace = "http://service/")
-public class GetUsingStringResponse {
-
-    @XmlElementRef(name = "return", type = JAXBElement.class)
-    protected JAXBElement<AnObject> _return;
-
-    /**
-     * Gets the value of the return property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public JAXBElement<AnObject> getReturn() {
-        return _return;
-    }
-
-    /**
-     * Sets the value of the return property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public void setReturn(JAXBElement<AnObject> value) {
-        this._return = ((JAXBElement<AnObject>)value);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
deleted file mode 100644
index 61c7c6cb19..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
+++ /dev/null
@@ -1,126 +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 service.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for moreComplexObject complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="moreComplexObject">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="intParam" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;element name="stringParam" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="stringParam2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "moreComplexObject", namespace = "", propOrder = {"intParam", "stringParam", "stringParam2"})
-public class MoreComplexObject {
-
-    protected Integer intParam;
-    protected String stringParam;
-    protected String stringParam2;
-
-    /**
-     * Gets the value of the intParam property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getIntParam() {
-        return intParam;
-    }
-
-    /**
-     * Sets the value of the intParam property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setIntParam(Integer value) {
-        this.intParam = value;
-    }
-
-    /**
-     * Gets the value of the stringParam property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStringParam() {
-        return stringParam;
-    }
-
-    /**
-     * Sets the value of the stringParam property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStringParam(String value) {
-        this.stringParam = value;
-    }
-
-    /**
-     * Gets the value of the stringParam2 property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStringParam2() {
-        return stringParam2;
-    }
-
-    /**
-     * Sets the value of the stringParam2 property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStringParam2(String value) {
-        this.stringParam2 = value;
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
deleted file mode 100644
index 1ba0c497d9..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
+++ /dev/null
@@ -1,141 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the service.jaxws package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _GetUsingMoreComplexObjectArg0_QNAME = new QName("", "arg0");
-    private final static QName _GetUsingStringResponseReturn_QNAME = new QName("", "return");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: service.jaxws
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link AnObject }
-     * 
-     */
-    public AnObject createAnObject() {
-        return new AnObject();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingStringResponse }
-     * 
-     */
-    public GetUsingStringResponse createGetUsingStringResponse() {
-        return new GetUsingStringResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingMoreComplexObjectResponse }
-     * 
-     */
-    public GetUsingMoreComplexObjectResponse createGetUsingMoreComplexObjectResponse() {
-        return new GetUsingMoreComplexObjectResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingString }
-     * 
-     */
-    public GetUsingString createGetUsingString() {
-        return new GetUsingString();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingMoreComplexObject }
-     * 
-     */
-    public GetUsingMoreComplexObject createGetUsingMoreComplexObject() {
-        return new GetUsingMoreComplexObject();
-    }
-
-    /**
-     * Create an instance of {@link MoreComplexObject }
-     * 
-     */
-    public MoreComplexObject createMoreComplexObject() {
-        return new MoreComplexObject();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MoreComplexObject }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "arg0", scope = GetUsingMoreComplexObject.class)
-    public JAXBElement<MoreComplexObject> createGetUsingMoreComplexObjectArg0(MoreComplexObject value) {
-        return new JAXBElement<MoreComplexObject>(_GetUsingMoreComplexObjectArg0_QNAME, MoreComplexObject.class,
-                                                  GetUsingMoreComplexObject.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AnObject }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "return", scope = GetUsingStringResponse.class)
-    public JAXBElement<AnObject> createGetUsingStringResponseReturn(AnObject value) {
-        return new JAXBElement<AnObject>(_GetUsingStringResponseReturn_QNAME, AnObject.class,
-                                         GetUsingStringResponse.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AnObject }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "return", scope = GetUsingMoreComplexObjectResponse.class)
-    public JAXBElement<AnObject> createGetUsingMoreComplexObjectResponseReturn(AnObject value) {
-        return new JAXBElement<AnObject>(_GetUsingStringResponseReturn_QNAME, AnObject.class,
-                                         GetUsingMoreComplexObjectResponse.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "arg0", scope = GetUsingString.class)
-    public JAXBElement<String> createGetUsingStringArg0(String value) {
-        return new JAXBElement<String>(_GetUsingMoreComplexObjectArg0_QNAME, String.class, GetUsingString.class, value);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/SomeService.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/SomeService.java
deleted file mode 100644
index 4a584a8da2..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/SomeService.java
+++ /dev/null
@@ -1,65 +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 service.generated;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "SomeService", targetNamespace = "http://service/")
-@XmlSeeAlso( {ObjectFactory.class})
-public interface SomeService {
-
-    /**
-     * 
-     * @param arg0
-     * @return
-     *     returns service.generated.AnObject
-     */
-    @WebMethod
-    @WebResult(targetNamespace = "")
-    @RequestWrapper(localName = "getUsingMoreComplexObject", targetNamespace = "http://service/", className = "service.generated.GetUsingMoreComplexObject")
-    @ResponseWrapper(localName = "getUsingMoreComplexObjectResponse", targetNamespace = "http://service/", className = "service.generated.GetUsingMoreComplexObjectResponse")
-    public AnObject getUsingMoreComplexObject(@WebParam(name = "arg0", targetNamespace = "")
-    MoreComplexObject arg0);
-
-    /**
-     * 
-     * @param arg0
-     * @return
-     *     returns service.generated.AnObject
-     */
-    @WebMethod
-    @WebResult(targetNamespace = "")
-    @RequestWrapper(localName = "getUsingString", targetNamespace = "http://service/", className = "service.generated.GetUsingString")
-    @ResponseWrapper(localName = "getUsingStringResponse", targetNamespace = "http://service/", className = "service.generated.GetUsingStringResponse")
-    public AnObject getUsingString(@WebParam(name = "arg0", targetNamespace = "")
-    String arg0);
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
deleted file mode 100644
index 44c2b67256..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
+++ /dev/null
@@ -1,81 +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 service.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "SomeServiceService", targetNamespace = "http://service/", wsdlLocation = "file:/C:/Tuscany/java/sca/itest/wsdlless/src/main/resources/some.wsdl")
-public class SomeServiceService extends Service {
-
-    private final static URL SOMESERVICESERVICE_WSDL_LOCATION;
-
-    static {
-        URL url = null;
-        try {
-            url = new URL("file:/C:/Tuscany/java/sca/itest/wsdlless/src/main/resources/some.wsdl");
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        SOMESERVICESERVICE_WSDL_LOCATION = url;
-    }
-
-    public SomeServiceService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public SomeServiceService() {
-        super(SOMESERVICESERVICE_WSDL_LOCATION, new QName("http://service/", "SomeServiceService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns SomeService
-     */
-    @WebEndpoint(name = "SomeServicePort")
-    public SomeService getSomeServicePort() {
-        return (SomeService)super.getPort(new QName("http://service/", "SomeServicePort"), SomeService.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns SomeService
-     */
-    @WebEndpoint(name = "SomeServicePort")
-    public SomeService getSomeServicePort(WebServiceFeature... features) {
-        return (SomeService)super.getPort(new QName("http://service/", "SomeServicePort"), SomeService.class, features);
-    }
-
-}
diff --git a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/package-info.java b/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/package-info.java
deleted file mode 100644
index d7b3fef82e..0000000000
--- a/tags/java/sca/1.3-RC1a/itest/wsdlless/src/test/java/service/generated/package-info.java
+++ /dev/null
@@ -1,21 +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.    
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://service/")
-package service.generated;
-